kitchen-puppet 1.45.0 → 1.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc9867719f776ed274af4071a93f2e596f874741
-  data.tar.gz: 46b3fec2a7f164ec354ff6787f47f66c4508b83d
+  metadata.gz: c5dc746ed2da8713a22e51d2617606ea867f4344
+  data.tar.gz: ad89bbde2f6781bfa45e6e87d0c7297f69f71f67
 SHA512:
-  metadata.gz: 1263a1c2d9d8dd8d9ff5150efa040cf4db40080fd509e916473991c105ff82f9979fe15f278f002555f4d83dbf49e2ba064ed1f793df4b184e86fe662e0ec3e8
-  data.tar.gz: f68fa758a2873c03ecec436ddb13e321531f3d34da14c2879da990170148f67ea7ebb85ffab02694d5701fe6050dbde47016192a6d26d953ed732f6bbfd9c89f
+  metadata.gz: e4908784a514c2cbac99d941ec6ba49d7f5453b06d7f2e0155143dec35ba1694e778890ccc7aef536986b942eee1224648af809dec1dc657bbafba633914337f
+  data.tar.gz: ca0b413cbcdb1ade56fdb433649fb6b9fe829eb3c75db9708610291dde5448e500497e923e6dee477d5f303885242e57690674fb47fb8a732706c7707032663e

data/README.md

@@ -14,7 +14,14 @@ The PuppetApply provider works by passing the puppet repository based on attribu
 The PuppetAgent provider works by passing the puppetmaster and other attributes in .kitchen.yml & calling puppet agent.
 
 
-This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox as well as various docker .
+This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox as well as various docker.
+
+## Resources
+* http://ehaselwanter.com/en/blog/2014/05/08/using-test-kitchen-with-puppet
+* http://www.slideshare.net/MartinEtmajer/testdriven-infrastructure-with-puppet-test-kitchen-serverspec-and-rspec
+* http://www.slideshare.net/YuryTsarev/containercon-test-driven-infrastructure
+* http://events.linuxfoundation.org/sites/events/files/slides/ContainerCon%20-%20Test%20Driven%20Infrastructure_0.pdf
+* https://www.cedric-meury.ch/2016/10/test-driven-infrastructure-with-puppet-docker-test-kitchen-and-serverspec-yury-tsarev-gooddata
 
 ## Windows Workstation Install
 You need to download the puppet msi and install it and run everything inside the puppet window.
@@ -148,8 +155,10 @@ To implement this with test-kitchen setup the puppet repository with:
 
 * install kitchen-verifier-serverspec on your workstation i.e. 'gem install kitchen-verifier-serverspec'
 
+See examples:
+* [https://github.com/neillturner/puppet_vagrant_repo](https://github.com/neillturner/puppet_vagrant_repo)
 
-See example [https://github.com/neillturner/puppet_repo](https://github.com/neillturner/puppet_repo)
+* [https://github.com/neillturner/puppet_repo](https://github.com/neillturner/puppet_repo)
 
 ```
 .

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.45.0'.freeze
+    VERSION = '1.45.1'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -221,10 +221,11 @@ module Kitchen
             info("Installing puppet on #{puppet_platform}")
             <<-INSTALL
               if(Get-Command puppet -ErrorAction 0) { return; }
-              if( [Environment]::Is64BitOperatingSystem ) {
-                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}-x64.msi"
+              $architecture = if( [Environment]::Is64BitOperatingSystem ) { '-x64' } else { '' }
+              if( '#{puppet_windows_version}' -eq 'latest' ) {
+                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet${architecture}-latest.msi"
               } else {
-                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}.msi"
+                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}${architecture}.msi"
               }
               $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', $MsiUrl
               if ($process.ExitCode -ne 0) {
@@ -305,6 +306,24 @@ module Kitchen
           #{install_busser}
           #{custom_install_command}
           INSTALL
+        when /^windows.*/
+          info("Installing Puppet Collections on #{puppet_platform}")
+          <<-INSTALL
+            if(Get-Command puppet -ErrorAction 0) { return; }
+            $architecture = if( [Environment]::Is64BitOperatingSystem ) { 'x64' } else { 'x86' }
+            if( '#{puppet_windows_version}' -eq 'latest' ) {
+                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-${architecture}-latest.msi"
+            } else {
+                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
+            }
+            $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', $MsiUrl
+            if ($process.ExitCode -ne 0) {
+                Write-Host "Installer failed."
+                Exit 1
+            }
+
+            #{install_busser}
+          INSTALL
         else
           info('Installing Puppet Collections, will try to determine platform os')
           <<-INSTALL
@@ -564,13 +583,7 @@ module Kitchen
           ].join(' ')
         end
 
-        if hiera_data && hiera_data_remote_path == '/var/lib/hiera'
-          commands << [
-            sudo("#{cp_command} -r"), File.join(config[:root_path], 'hiera'), '/var/lib/'
-          ].join(' ')
-        end
-
-        if hiera_data && hiera_data_remote_path != '/var/lib/hiera'
+        if hiera_data
           commands << [
             sudo(mkdir_command), hiera_data_remote_path
           ].join(' ')
@@ -746,10 +759,9 @@ module Kitchen
       end
 
       def puppet_cmd
-        puppet_bin = powershell_shell? ? '& "C:\Program Files\Puppet Labs\Puppet\bin\puppet"' : 'puppet'
-        if config[:require_puppet_collections]
-          puppet_bin = "#{config[:puppet_coll_remote_path]}/bin/puppet"
-        end
+        return '& "C:\Program Files\Puppet Labs\Puppet\bin\puppet"' if powershell_shell?
+
+        puppet_bin = config[:require_puppet_collections] ? "#{config[:puppet_coll_remote_path]}/bin/puppet" : 'puppet'
 
         if config[:puppet_no_sudo]
           puppet_bin
@@ -759,15 +771,13 @@ module Kitchen
       end
 
       def puppet_dir
-        return '/etc/puppetlabs/puppet' if config[:require_puppet_collections]
-        return '/etc/puppet' unless powershell_shell?
-        'C:/ProgramData/PuppetLabs/puppet/etc'
+        return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell_shell?
+        config[:require_puppet_collections] ? '/etc/puppetlabs/puppet' : '/etc/puppet'
       end
 
       def hiera_config_dir
-        return '/etc/puppetlabs/code' if config[:require_puppet_collections]
-        return '/etc/puppet' unless powershell_shell?
-        'C:/ProgramData/PuppetLabs/puppet/etc'
+        return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell_shell?
+        config[:require_puppet_collections] ? '/etc/puppetlabs/code' : '/etc/puppet'
       end
 
       def puppet_debian_version
@@ -791,7 +801,7 @@ module Kitchen
       end
 
       def puppet_windows_version
-        config[:puppet_version] ? config[:puppet_version].to_s : '3.8.6'
+        config[:puppet_version] ? config[:puppet_version].to_s : 'latest'
       end
 
       def puppet_environment_flag

data/provisioner_options.md

@@ -56,6 +56,7 @@ install_hiera | false | Installs `hiera-puppet` package. Not needed for puppet >
 librarian_puppet_ssl_file | nil | ssl certificate file for librarian-puppet
 manifest | 'site.pp' | manifest for puppet apply to run
 manifests_path | | puppet repo manifests directory
+max_retries| 1 | maximum number of retry attempts of converge command 
 modules_path | | puppet repo manifests directory. Can be multiple directories separated by colons and then they will be merged
 platform | platform_name kitchen.yml parameter | OS platform of server
 puppet_apply_command | nil | Overwrite the puppet apply command. Needs "sudo -E puppet apply" as a prefix.
@@ -90,7 +91,9 @@ require_puppet_collections | false | Set if using puppet collections install (Pu
 require_puppet_omnibus | false | Set if using omnibus puppet install
 require_puppet_repo | true | Set if using a puppet install from yum or apt repo
 resolve_with_librarian_puppet | true | Use librarian_puppet to resolve modules if a Puppetfile is found
+retry_on_exit_code| [] | Array of exit codes to retry converge command against
 update_package_repos| true| update OS repository metadata
+wait_for_retry| 30 | number of seconds to wait before retrying converge command 
 
 ## Puppet Apply Configuring Provisioner Options
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.45.0
+  version: 1.45.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen