kitchen-puppet 1.48.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e0d4e20a145eddab72ac3db27bdaf1bcee24d5e
-  data.tar.gz: 1a46e08b13ea72e6dde4745ca253733321eb4ba0
+  metadata.gz: bc443e789c42271e0ea4a036a0f64824b9e4947e
+  data.tar.gz: 66021dc606cc056dc2d2776d9cc9e5591e7c02cc
 SHA512:
-  metadata.gz: 1364f3924e290e7b61c141cb1063445b2ce48549047d6849ef80da1fd3d11b6466b63e5993ee14de7311cba6132a979471dcadf0160d57f4c5110e3049c39370
-  data.tar.gz: c6dc0b4fc53fa59b6c45f1dfd9653618e540178da3fe2af458f3bfed304453f1c813ad58118b8520e9ae0c81abdac3f597b9ec6a53068d6dbdab909ca37aaed1
+  metadata.gz: 33c28b9cfe62c3ef95a0450fe9745b6d68ee3edf83cbc9d07cd8e7dc868c618e7ffd6ce56179012630b4907854d5c7022a1640843069b266ba53fe74f077cf80
+  data.tar.gz: f8c5e852419e4c5432b3128637f8abec967aa40e8383c2ba4c918264980adc5be2b12d11e1817890e8e33c310f01c996551075d94579c6157282f4709ed3011b

data/lib/kitchen-puppet/version.rb

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

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -60,6 +60,15 @@ module Kitchen
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
       default_config :puppet_environment, nil
+      default_config :puppet_environment_config_path do |provisioner|
+        provisioner.calculate_path('environment.conf')
+      end
+      default_config :puppet_environment_remote_modules_path, 'modules'
+      default_config :puppet_environment_remote_manifests_path, 'manifests'
+      default_config :puppet_environment_remote_hieradata_path, 'hieradata'
+      default_config :puppet_environment_hiera_config_path do |provisioner|
+        provisioner.calculate_path('hiera.yaml', :file)
+      end
       default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
       default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
       default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
@@ -112,6 +121,7 @@ module Kitchen
       end
 
       default_config :hiera_config_path do |provisioner|
+        provisioner.calculate_path('hiera.global.yaml', :file) ||
         provisioner.calculate_path('hiera.yaml', :file)
       end
 
@@ -157,6 +167,7 @@ module Kitchen
 
       default_config :hiera_eyaml, false
       default_config :hiera_eyaml_key_remote_path, '/etc/puppet/secure/keys'
+      default_config :puppet_environmentpath_remote_path, nil
 
       default_config :hiera_eyaml_gpg, false
       default_config :hiera_eyaml_gpg_recipients, false
@@ -521,14 +532,15 @@ module Kitchen
       end
 
       def init_command
-        todelete = %w[modules manifests files hiera hiera.yaml facter spec enc]
+        todelete = %w[modules manifests files hiera hiera.yaml hiera.global.yaml facter spec enc environment]
                    .map { |dir| File.join(config[:root_path], dir) }
         todelete += [hiera_data_remote_path,
                      '/etc/hiera.yaml',
                      "#{puppet_dir}/hiera.yaml",
                      spec_files_remote_path.to_s,
                      "#{puppet_dir}/fileserver.conf"]
-        todelete << File.join(puppet_dir, config[:puppet_environment]) if config[:puppet_environment]
+        todelete << File.join(puppet_dir, puppet_environment) if puppet_environment
+        todelete << File.join(puppet_environmentpath_remote_path, puppet_environment) if puppet_environment_config && puppet_environment
         cmd = "#{sudo(rm_command_paths(todelete))};"
         cmd += " #{mkdir_command} #{config[:root_path]};"
         cmd += " #{sudo(mkdir_command)} #{puppet_dir}"
@@ -547,6 +559,7 @@ module Kitchen
         prepare_facts
         prepare_puppet_config
         prepare_hiera_config
+        prepare_puppet_environment
         prepare_fileserver_config
         prepare_hiera_data
         prepare_enc
@@ -602,16 +615,6 @@ module Kitchen
           ].join(' ')
         end
 
-        if hiera_config
-          commands << [
-            sudo(cp_command), File.join(config[:root_path], 'hiera.yaml'), '/etc/'
-          ].join(' ')
-
-          commands << [
-            sudo(cp_command), File.join(config[:root_path], 'hiera.yaml'), hiera_config_dir
-          ].join(' ')
-        end
-
         if fileserver_config
           commands << [
             sudo(cp_command),
@@ -655,7 +658,31 @@ module Kitchen
 
         if puppet_environment
           commands << [
-            sudo('ln -s '), config[:root_path], File.join(puppet_dir, config[:puppet_environment])
+            sudo('ln -s '), config[:root_path], File.join(puppet_dir, puppet_environment)
+          ].join(' ')
+        end
+
+        if puppet_environment_config && puppet_environment
+          commands << [
+            sudo(mkdir_command), puppet_environmentpath_remote_path
+          ].join(' ')
+          commands << [
+            sudo(mkdir_command), File.join(puppet_environmentpath_remote_path, puppet_environment)
+          ].join(' ')
+          commands << [
+            sudo('ln -s '), File.join(config[:root_path], 'modules'), File.join(puppet_environmentpath_remote_path, puppet_environment, puppet_environment_remote_modules_path)
+          ].join(' ')
+          commands << [
+            sudo('ln -s '), File.join(config[:root_path], 'manifests'), File.join(puppet_environmentpath_remote_path, puppet_environment, puppet_environment_remote_manifests_path)
+          ].join(' ')
+          commands << [
+            sudo('ln -s '), File.join(config[:root_path], 'hiera'), File.join(puppet_environmentpath_remote_path, puppet_environment, puppet_environment_remote_hieradata_path)
+          ].join(' ')
+          commands << [
+            sudo('cp'), File.join(config[:root_path], 'environment', 'environment.conf'), File.join(puppet_environmentpath_remote_path, puppet_environment, 'environment.conf')
+          ].join(' ')
+          commands << [
+            sudo('cp'), File.join(config[:root_path], 'environment', 'hiera.yaml'), File.join(puppet_environmentpath_remote_path, puppet_environment, 'hiera.yaml')
           ].join(' ')
         end
 
@@ -694,6 +721,7 @@ module Kitchen
           puppet_environment_flag,
           puppet_noop_flag,
           puppet_enc_flag,
+          puppet_hiera_flag,
           puppet_detailed_exitcodes_flag,
           puppet_verbose_flag,
           puppet_debug_flag,
@@ -768,6 +796,25 @@ module Kitchen
         config[:puppet_environment]
       end
 
+      def puppet_environment_config
+        if config[:puppet_environment_config_path] && !puppet_environment
+          raise("ERROR: found environment config '#{config[:puppet_environment_config_path]}', however no 'puppet_environment' is specified. Please specify 'puppet_environment' or unset 'puppet_environment_config_path' in .kitchen.yml")
+        end
+        config[:puppet_environment_config_path]
+      end
+
+      def puppet_environment_remote_modules_path
+        config[:puppet_environment_remote_modules_path]
+      end
+
+      def puppet_environment_remote_manifests_path
+        config[:puppet_environment_remote_manifests_path]
+      end
+
+      def puppet_environment_remote_hieradata_path
+        config[:puppet_environment_remote_hieradata_path]
+      end
+
       def puppet_git_init
         config[:puppet_git_init]
       end
@@ -780,6 +827,10 @@ module Kitchen
         config[:hiera_config_path]
       end
 
+      def puppet_environment_hiera_config
+        config[:puppet_environment_hiera_config_path]
+      end
+
       def fileserver_config
         config[:fileserver_config_path]
       end
@@ -859,6 +910,15 @@ module Kitchen
         config[:require_puppet_collections] ? '/etc/puppetlabs/puppet' : '/etc/puppet'
       end
 
+      def puppet_environmentpath_remote_path
+        return config[:puppet_environmentpath_remote_path] if config[:puppet_environmentpath_remote_path]
+        if config[:puppet_version] =~ /^3/
+          powershell? ? 'C:/ProgramData/PuppetLabs/puppet/etc' : '/etc/puppet/environments'
+        else
+          powershell? ? 'C:/ProgramData/PuppetLabs/code/environments' : '/etc/puppetlabs/code/environments'
+        end
+      end
+
       def hiera_config_dir
         return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell?
         config[:require_puppet_collections] ? '/etc/puppetlabs/code' : '/etc/puppet'
@@ -890,9 +950,9 @@ module Kitchen
 
       def puppet_environment_flag
         if config[:puppet_version] =~ /^2/
-          config[:puppet_environment] ? "--environment=#{config[:puppet_environment]}" : nil
+          config[:puppet_environment] ? "--environment=#{puppet_environment}" : nil
         else
-          config[:puppet_environment] ? "--environment=#{config[:puppet_environment]} --environmentpath=#{puppet_dir}" : nil
+          config[:puppet_environment] ? "--environment=#{puppet_environment} --environmentpath=#{puppet_environmentpath_remote_path}" : nil
         end
       end
 
@@ -1000,6 +1060,10 @@ module Kitchen
         config[:puppet_enc] ? "--node_terminus=exec --external_nodes=#{config[:root_path]}/enc/#{File.basename(config[:puppet_enc])}" : nil
       end
 
+      def puppet_hiera_flag
+        hiera_config ? "--hiera_config=#{config[:root_path]}/hiera.global.yaml" : nil
+      end
+
       def puppet_detailed_exitcodes_flag
         config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
       end
@@ -1255,13 +1319,29 @@ module Kitchen
         FileUtils.cp_r(config[:puppet_enc], File.join(enc_dir, '/'))
       end
 
+      def prepare_puppet_environment
+        return unless puppet_environment_config
+
+        info('Preparing Environment Config')
+        environment_dir = File.join(sandbox_path, 'environment')
+        FileUtils.mkdir_p(environment_dir)
+        debug("Using Environment Config environment.conf from #{puppet_environment_config}")
+        FileUtils.cp_r(puppet_environment_config, File.join(environment_dir, 'environment.conf'))
+        if puppet_environment_hiera_config
+          debug("Using Environment Hiera Config hiera.yaml from #{puppet_environment_hiera_config}")
+          FileUtils.cp_r(puppet_environment_hiera_config, File.join(environment_dir, 'hiera.yaml'))
+        else
+          info('No Environment hiera.yaml found')
+        end
+      end
+
       def prepare_hiera_config
         return unless hiera_config
 
-        info('Preparing hiera')
+        info('Preparing hiera (global layer)')
         debug("Using hiera from #{hiera_config}")
 
-        FileUtils.cp_r(hiera_config, File.join(sandbox_path, 'hiera.yaml'))
+        FileUtils.cp_r(hiera_config, File.join(sandbox_path, 'hiera.global.yaml'))
       end
 
       def prepare_fileserver_config

data/provisioner_options.md

@@ -38,7 +38,7 @@ facter_file | nil | yaml file of custom facter_files to be provided to the puppe
 facter_version | "latest"| desired version, affects apt installs.
 files_path | | directory to place at /tmp/kitchen/files
 fileserver_config_path | | file to place fileserver.conf
-hiera_config_path | | path to hiera.yaml
+hiera_config_path | hiera.global.yaml then hiera.yaml | path to hiera.yaml
 hiera_data_path | | puppet repo hiera data directory
 hiera_data_remote_path | "/var/lib/hiera" | Hiera data directory on server
 hiera_deep_merge | false | install the deep_merge gem to support hiera deep merge mode
@@ -80,6 +80,12 @@ puppet_debug| false| Enable full debugging logging on puppet run
 puppet_detailed_exitcodes | nil | Provide transaction information via exit codes. See `--detailed-exitcodes` section of `puppet help apply`
 puppet_enc | | path for external node classifier script
 puppet_environment | nil | puppet environment for running puppet apply (Must set if using Puppet v4)
+puppet_environment _config_path | "environment.conf" | Puppet environment config file
+puppet_environment _hiera_config_path | "hiera.yaml" | Environment layer hiera config file (see Puppet 4.10), only used if puppet _environmentpath = true
+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_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"

metadata

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