kitchen-puppet 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc443e789c42271e0ea4a036a0f64824b9e4947e
-  data.tar.gz: 66021dc606cc056dc2d2776d9cc9e5591e7c02cc
+  metadata.gz: 6d938acbde5a2eab0ce1af65429bc730d06db41a
+  data.tar.gz: bcc6c23f6c24b7174f5f93eb8523bcfca3ceb5a9
 SHA512:
-  metadata.gz: 33c28b9cfe62c3ef95a0450fe9745b6d68ee3edf83cbc9d07cd8e7dc868c618e7ffd6ce56179012630b4907854d5c7022a1640843069b266ba53fe74f077cf80
-  data.tar.gz: f8c5e852419e4c5432b3128637f8abec967aa40e8383c2ba4c918264980adc5be2b12d11e1817890e8e33c310f01c996551075d94579c6157282f4709ed3011b
+  metadata.gz: 8e13655c07d949e30eb05d821d08eebfd0a37d5e8322e81b1dc79330c0ffc20a0e40fef1e9c3619b2e322671242e26e15a6ec726d4c9326732e4cf1d83f758e5
+  data.tar.gz: bf3c5f53ea12eca73a217e78dd1fb04ed46ac3e30151ed4b089fcc7fc10103a008c9ba5081de7da1c50748741b189e3b5f3efd61b864eb6ac9680c5b3c324f1e

data/README.md

@@ -22,6 +22,7 @@ This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes runni
 * 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
+* https://docs.puppet.com/puppet/latest/puppet_platform.html
 
 ## Windows Workstation Install
 You need to download the puppet msi and install it and run everything inside the puppet window.
@@ -204,18 +205,17 @@ driver:
   name: vagrant
 
 provisioner:
-  #name: puppet_apply
-  name: puppet_hierawriter_apply
+  name: puppet_apply
   manifests_path: /repository/puppet_repo/manifests
   modules_path: /repository/puppet_repo/modules-mycompany
   hiera_data_path: /repository/puppet_repo/hieradata
   hiera_writer_files:
     - datacenter/vagrant.yaml:
-      logstash_servers: []
-      hosts:
-        10.1.2.3:
-        - puppet
-        - puppetdb
+        logstash_servers: []
+        hosts:
+          10.1.2.3:
+          - puppet
+          - puppetdb
 
 platforms:
 - name: nocm_ubuntu-12.04

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '2.0.0'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -46,9 +46,9 @@ module Kitchen
     class PuppetApply < Base
       attr_accessor :tmp_dir
 
-      default_config :require_puppet_collections, false
-      default_config :puppet_yum_collections_repo, 'http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm'
-      default_config :puppet_apt_collections_repo, 'http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb'
+      default_config :require_puppet_collections, true
+      default_config :puppet_yum_collections_repo, 'http://yum.puppetlabs.com/puppet5/puppet-release-el-6.noarch.rpm'
+      default_config :puppet_apt_collections_repo, 'http://apt.puppetlabs.com/puppet5-release-wheezy.deb'
       default_config :puppet_coll_remote_path, '/opt/puppetlabs'
       default_config :puppet_version, nil
       default_config :facter_version, nil
@@ -78,7 +78,7 @@ module Kitchen
       default_config :custom_pre_apply_command, nil
       default_config :puppet_whitelist_exit_code, nil
       default_config :require_puppet_omnibus, false
-      default_config :puppet_omnibus_url, 'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet.sh'
+      default_config :puppet_omnibus_url, 'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_5_agent.sh'
       default_config :puppet_enc, nil
       default_config :ignore_spec_fixtures, false
 
@@ -249,6 +249,8 @@ module Kitchen
               $architecture = if( [Environment]::Is64BitOperatingSystem ) { '-x64' } else { '' }
               if( '#{puppet_windows_version}' -eq 'latest' ) {
                   $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet${architecture}-latest.msi"
+              } elseif( '#{puppet_windows_version}' -like '5.*' ) {
+                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
               } else {
                   $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}${architecture}.msi"
               }
@@ -338,13 +340,16 @@ module Kitchen
           INSTALL
         when /^windows.*/
           info("Installing Puppet Collections on #{puppet_platform}")
+          info('Powershell is not recognised by core test-kitchen assuming it is present') unless powershell_shell?
           <<-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"
+            } elseif( '#{puppet_windows_version}' -like '5.*' ) {
+                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
             } else {
-                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
+                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}${architecture}.msi"
             }
             Invoke-WebRequest $MsiUrl -UseBasicParsing -OutFile "C:/puppet-agent.msi" #{posh_proxy_parm}
             $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet-agent.msi'
@@ -945,7 +950,7 @@ module Kitchen
       end
 
       def puppet_windows_version
-        config[:puppet_version] ? config[:puppet_version].to_s : 'latest'
+        config[:puppet_version] ? config[:puppet_version].to_s : '5.0.0'
       end
 
       def puppet_environment_flag

data/provisioner_options.md

@@ -9,15 +9,15 @@ It installs it in the following order:
 
    Installs using the omnibus_puppet script and passes the puppet_version if specied as -v option.
 
-* If require_puppet_collections is set to true
+* If require_puppet_collections is set to true (the default)
 
    Installs from the puppet collection.
-   This is required if you wish to install puppet version 4.
+   This is required if you wish to install puppet version 4 or 5.
 
    You get the version of puppet in the collection. To influence which puppet version is install modify either
    * puppet_yum_collections_repo
    * puppet_apt_collections_repo
-   to an new collection. At time of writing there was only one collection PC1.
+   to an new collection. At time of writing there are only 2 collections PC1 and puppet5.
 
 * if require_puppet_repo is set to true (the default)
 
@@ -70,10 +70,10 @@ puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| ap
 _for Ubuntu14 change to_ |      "http://apt.puppetlabs.com/puppetlabs-release-trusty.deb" |
 _for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-jessie.deb" |
 _for Ubuntu16.04 change to_ |   "http://apt.puppetlabs.com/puppetlabs-release-xenial.deb" |
-puppet_apt_collections_repo | "http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb" | apt collections repo
-_for Ubuntu14 change to_ |      "http://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb" |
-_for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-pc1-jessie.deb" |
-_for Ubuntu16.04 change to_ |   "http://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb" |
+puppet_apt_collections_repo | "http://apt.puppetlabs.com/puppet5-release-wheezy.deb" | apt collections repo
+_for Ubuntu14 change to_ |      "http://apt.puppetlabs.com/puppet5-release-trusty.deb" |
+_for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppet5-release-jessie.deb" |
+_for Ubuntu16.04 change to_ |   "http://apt.puppetlabs.com/puppet5-release-xenial.deb" |
 puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a puppet collections install.
 puppet_config_path | | path of custom puppet.conf file
 puppet_debug| false| Enable full debugging logging on puppet run
@@ -90,7 +90,8 @@ puppet_future_parser | false | Run puppet with the future parser enabled  (see h
 puppet_git_init | nil | initialize puppet from GIT repository, e.g. "git@github.com:example/puppet-repo.git"
 puppet_git_pr | nil | checkout specific Pull Request from repository specified in puppet_git_init, e.g. "324"
 puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted
-puppet_omnibus_url | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet.sh | omnibus puppet v3 install location.
+puppet_omnibus_url | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_5_agent.sh | omnibus puppet v5 install location.
+_for puppet v3 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet.sh |
 _for puppet v4 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_agent.sh |
 puppet_noop| false| puppet runs in a no-op or dry-run mode
 puppet_no_sudo | false | allow puppet command to run without sudo if required
@@ -100,12 +101,12 @@ puppet_version | "latest"| desired version, affects apt installs.
 puppet_whitelist_exit_code | nil | Whitelist exit code expected from puppet run. Intended to be used together with `puppet_detailed_exitcodes`. You can also specify a yaml list here (you should use 0 and 2 for `puppet_detailed_exitcodes` to capture puppet runtime errors and allow multiple converge runs (without changes)).
 puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"| yum repo RH/Centos6
 _for RH/Centos7 change to_ | "https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm" |
-puppet_yum_collections_repo | "http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm" | yum collections repo RH/Centos6
-_for RH/Centos7 change to_ | "https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm" |
+puppet_yum_collections_repo | "http://yum.puppetlabs.com/puppet5/puppet-release-el-6.noarch.rpm" | yum collections repo RH/Centos6
+_for RH/Centos7 change to_ | "http://yum.puppetlabs.com/puppet5/puppet-release-el-7.noarch.rpm" |
 puppetfile_path | | Path to Puppetfile
 remove_puppet_repo | false | remove copy of puppet repository and puppet configuration on server after running puppet
 require_chef_for_busser | true | Install chef as currently needed by busser to run tests
-require_puppet_collections | false | Set if using puppet collections install (Puppet v4)
+require_puppet_collections | true | Set if using puppet collections install (Puppet v4)
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen