kitchen-puppet 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93328da13c432cc671d172ac114f3dbe2f27734d
-  data.tar.gz: 2881c284c293ac6bf6005d27191345a1fc26f154
+  metadata.gz: a470760d6bcccb5f146c2a0d24d06467ad526144
+  data.tar.gz: 1b57a1ca243cd8706a992ec3c513ca7407f6a640
 SHA512:
-  metadata.gz: ef2fbedd901a0fa14aae3df7bb329a5fb3757ee5181e913b254abc96e36c873cf054b6b0d1dd31b29aa1e0197c90d886b54d4a269bf9241a63091b72fb6a8e96
-  data.tar.gz: 1a6b541cfdc100bc74d96252770eb93ca9cefc6480eed725bc2206a861a1ddce79e13345b67888d9f47967dadf95e179af0c10c68f5625f6029e30ad8465b26d
+  metadata.gz: bef6ae28d59b2d6921ab36718d629f82b00e11dfc9793372f0eb7003446733289626f9f12a0382138a91abf1f447edb16727da34208960809f8ec8a87d8675fe
+  data.tar.gz: 91275834a49dfe7777faabd17b6ed0c5894baec9ead78b0e169db2fb2f437f022e03b286143416a285f3fbecf33cd522ddfacb552f880186c5e4f1cf43e800fd

data/README.md

@@ -30,7 +30,7 @@ This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes runni
 
 2. From a Command prompt:
   * gem install librarian-puppet
-  * gem install test-kitchen
+  * gem install test-kitchen  (or gem install test-kitchen -v 1.16.0 if using ruby version less than 2.3)
   * gem install kitchen-puppet
 
 ## Requirements
@@ -54,6 +54,45 @@ Sample Puppet Repositories
   * A sample hello world example puppet repository for vagrant: https://github.com/neillturner/puppet_vagrant_windows_repo
   * A more extensive sample installing virtualbox on windows: https://github.com/red-gate/puppet-virtualbox_windows
 
+## Using Environments
+
+In the root directory for your puppet repository:
+
+Create a `.kitchen.yml`, much like one the described above:
+
+```yaml
+    ---
+    driver:
+      name: vagrant
+
+    provisioner:
+      name: puppet_apply
+      puppet_environment: dev
+# the puppet environmnt files can be in this repository
+      puppet_environment_config_path: environment/dev/environment.conf
+      manifests_path:  environment/dev/manifests
+      modules_path: environment/dev/modules_mycompany
+# or external to this repository as long as they are accessible
+#     puppet_environment_config_path: /my_environments/dev/environment.conf
+#     manifests_path:                 /my_environments/dev/manifests
+#     modules_path:                   /my_environments/dev/modules_mycompany
+      hiera_data_path: /repository/puppet_repo/hieradata
+
+    platforms:
+    - name: nocm_ubuntu-12.04
+      driver_plugin: vagrant
+      driver_config:
+        box: nocm_ubuntu-12.04
+        box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+
+    suites:
+     - name: default
+```
+
+Sample Puppet Repositories
+  * A sample hello world example puppet repository without environents : https://github.com/neillturner/puppet_vagrant_repo
+  * A sample hello world example puppet repository with environents : https://github.com/neillturner/puppet_vagrant_environment_repo
+
 ## Test-Kitchen Serverspec
 
 To run the verify step with the test-kitchen serverspec setup your puppet repository as follows:

data/kitchen-puppet.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0'
   s.add_dependency 'test-kitchen', '~> 1.4'
   s.add_dependency 'net-ssh', '>= 3'
-  s.description = <<-EOF
+  s.description = <<-TEXT
   == DESCRIPTION:
 
   Puppet Provisioner for Test Kitchen
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
 
   Supports puppet apply, puppet agent, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections (v4)
 
-EOF
+TEXT
 end

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.1.3'.freeze
+    VERSION = '3.1.4'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -316,7 +316,7 @@ module Kitchen
       end
 
       def puppet_masterport_flag
-        config[:puppet_masterport] ? '--masterport=#{config[:puppet_masterport]}' : nil
+        config[:puppet_masterport] ? "--masterport=#{config[:puppet_masterport]}" : nil
       end
 
       def puppet_detailed_exitcodes_flag

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -248,7 +248,7 @@ module Kitchen
               if(Get-Command puppet -ErrorAction 0) { return; }
               $architecture = if( [Environment]::Is64BitOperatingSystem ) { '-x64' } else { '' }
               if( '#{puppet_windows_version}' -eq 'latest' ) {
-                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet${architecture}-latest.msi"
+                  $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 {
@@ -950,7 +950,7 @@ module Kitchen
       end
 
       def puppet_windows_version
-        config[:puppet_version] ? config[:puppet_version].to_s : '5.0.0'
+        config[:puppet_version] ? config[:puppet_version].to_s : 'latest'
       end
 
       def puppet_environment_flag
@@ -1295,6 +1295,7 @@ module Kitchen
         end
       end
 
+      # rubocop:disable Lint/RescueWithoutErrorClass
       def read_self_module_name
         if File.exist?(modulefile)
           warn('Modulefile found but this is deprecated, ignoring it, see https://tickets.puppetlabs.com/browse/PUP-1188')
@@ -1310,6 +1311,7 @@ module Kitchen
 
         module_name
       end
+      # rubocop:enable Lint/RescueWithoutErrorClass
 
       def prepare_puppet_config
         return unless puppet_config

data/provisioner_options.md

@@ -27,7 +27,7 @@ It installs it in the following order:
 
 key | default value | Notes
 ----|---------------|--------
-chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests) NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
+chef_bootstrap_url | https://www.getchef.com/ chef/install.sh | the chef (needed for busser to run tests) NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
 custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
 custom_options | | custom options to add to puppet apply command.
 custom_pre_install_command | nil | Custom shell command to be used at beginning of install stage. Can be multiline.
@@ -66,14 +66,14 @@ modules_path | | puppet repo manifests directory. Can be multiple directories se
 no_proxy | nil | list of URLs or IPs that should be excluded from proxying
 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.
-puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo Ubuntu12 see https://apt.puppetlabs.com for others
-_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/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_apt_repo | http://apt.puppetlabs.com/ puppetlabs-release-precise.deb | apt repo Ubuntu12 see https://apt.puppetlabs.com for others
+_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/ 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
@@ -85,8 +85,8 @@ puppet_environment _hiera_config_path | "hiera.yaml" | Environment layer hiera c
 puppet_environment _remote_hieradata_path | "hieradata" | Path in `puppet_environmentpath_remote_path` to contains the hiera data.
 puppet_environment _remote_modules_path | "modules" | Path in `puppet_environmentpath_remote_path` to contains the modules.
 puppet_environment _remote_manifests_path | "manifests" | Path in `puppet_environmentpath_remote_path` to contains the manifests.
-puppet _environmentpath_remote_path | "/etc/puppet/environments" (v3), "/etc/puppetlabs/code/environments" (v4) | The remote path for environments if `puppet_environmentpath` is true
-puppet_future_parser | false | Run puppet with the future parser enabled  (see https://docs.puppet.com/puppet/3.8/experiments_future.html).
+puppet _environmentpath_remote_path | /etc/puppet/environments (v3), /etc/puppetlabs/code/environments (v4) | The remote path for environments if `puppet_environment` is true
+puppet_future_parser | false | Run puppet with the future parser enabled  (see https://docs.puppet.com/ puppet/3.8/experiments_future.html).
 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
@@ -97,13 +97,12 @@ 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
 puppet_verbose| false| Extra information logging on puppet run
 puppet_show_diff| false| Show diffs for changes to config files during puppet runs.
-puppet_version | "latest"| desired version, affects apt installs.
-_for windows defaults to_ | 5.0.0 |
+puppet_version | "latest"| desired version, affects apt and most 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/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" |
+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/ 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
@@ -211,8 +210,8 @@ puppet_version | "latest"| desired version, affects apt installs.
 facter_version | "latest"| desired version, affects apt installs.
 platform | platform_name kitchen.yml parameter | OS platform of server
 require_puppet_repo | true | Set if using a puppet install from yum or apt repo
-puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo
-puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"| yum repo
+puppet_apt_repo | http://apt.puppetlabs.com/ puppetlabs-release-precise.deb| apt repo
+puppet_yum_repo | https://yum.puppetlabs.com/ puppetlabs-release-el-6.noarch.rpm| yum repo
 require_puppet_omnibus | false | Set if using omnibus puppet install
 puppet_omnibus_url | | omnibus puppet install location.
 puppet_omnibus_remote_path | "/opt/puppet" | Server Installation location of an omnibus puppet install.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: puppet provisioner for test-kitchen