kitchen-puppet 1.38.1 → 1.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b86557b055a6bec703e3cb5dec37119246367b14
-  data.tar.gz: e54294a521319c29da7c0217812cbaa1b46737a0
+  metadata.gz: cad0cbe145792a2fcf342705612af96281936da5
+  data.tar.gz: 7d16b7aaeb91ab2f9131008d2e901e6161476f09
 SHA512:
-  metadata.gz: 8842936f233daa01810837a9a80a2f713c4dc9080e1f6495cf62d8fe269b557d0255643fbb0c8438812e31d697acce5938ac9e7f2e2295a708ce4fa5a4545fa1
-  data.tar.gz: 59f909ccd17e1dd32ec58517040f98d4e577df0d21499c3bf270dddbbc2c8f20f5e6215c366853bf8ca97d24653c95d9941e716d8fa992e4c57b3efc615ff7fb
+  metadata.gz: 11ed24fe6cc60b777f5b60164a964751980cbbb45c6aad4ea159ef2740a6192169180404e06396ffcd973d00b60a78ef61dd24fd23cc634a8ba848b18d89aef0
+  data.tar.gz: e408a68f06dabc580cd5e7856eb4697ce5d85d87a8549139762ce4c502ae46c399d775cb823283842ce1b31cce5ad8fc5a44751723b7804c9b80f1aee9b95b3e

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.38.1'.freeze
+    VERSION = '1.39.0'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -64,6 +64,9 @@ module Kitchen
       default_config :puppet_logdest, nil
       default_config :custom_install_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_enc, nil
 
       default_config :puppet_apply_command, nil
 
@@ -165,9 +168,12 @@ module Kitchen
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install_command
-        return unless config[:require_puppet_collections] || config[:require_puppet_repo]
-        if config[:require_puppet_collections]
+        return unless config[:require_puppet_collections] || config[:require_puppet_repo] || config[:require_puppet_omnibus]
+        if config[:require_puppet_omnibus]
+          install_omnibus_command
+        elsif config[:require_puppet_collections]
           install_command_collections
         else
           case puppet_platform
@@ -229,6 +235,7 @@ module Kitchen
           end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def install_command_collections
         case puppet_platform
@@ -332,6 +339,20 @@ module Kitchen
         INSTALL
       end
 
+      def install_omnibus_command
+        info('Installing puppet using puppet omnibus')
+        <<-INSTALL
+        #{Util.shell_helpers}
+        if [ ! $(which puppet) ]; then
+          echo "-----> Installing Puppet Omnibus"
+          #{export_http_proxy_parm}
+          #{export_https_proxy_parm}
+          do_download #{config[:puppet_omnibus_url]} /tmp/install_puppet.sh
+          #{sudo_env('sh')} /tmp/install_puppet.sh
+        fi
+        INSTALL
+      end
+
       def install_hiera
         return unless config[:install_hiera]
         <<-INSTALL
@@ -410,6 +431,7 @@ module Kitchen
         prepare_hiera_config
         prepare_fileserver_config
         prepare_hiera_data
+        prepare_enc
         prepare_spec_files
         info('Finished Preparing files for transfer')
       end
@@ -516,6 +538,12 @@ module Kitchen
           ].join(' ')
         end
 
+        if config[:puppet_enc]
+          commands << [
+            sudo('chmod 755'), File.join("#{config[:root_path]}/enc", File.basename(config[:puppet_enc]))
+          ].join(' ')
+        end
+
         command = commands.join(' && ')
         debug(command)
         command
@@ -537,6 +565,7 @@ module Kitchen
             custom_options,
             puppet_environment_flag,
             puppet_noop_flag,
+            puppet_enc_flag,
             puppet_detailed_exitcodes_flag,
             puppet_verbose_flag,
             puppet_debug_flag,
@@ -778,6 +807,10 @@ module Kitchen
         bash_vars
       end
 
+      def puppet_enc_flag
+        config[:puppet_enc] ? '--node_terminus=exec --external_nodes=/tmp/kitchen/enc' : nil
+      end
+
       def puppet_detailed_exitcodes_flag
         config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
       end
@@ -982,6 +1015,14 @@ module Kitchen
         FileUtils.cp_r(puppet_config, File.join(sandbox_path, 'puppet.conf'))
       end
 
+      def prepare_enc
+        return unless config[:puppet_enc]
+        info 'Copying enc file'
+        enc_dir = File.join(sandbox_path, 'enc')
+        FileUtils.mkdir_p(enc_dir)
+        FileUtils.cp_r(config[:puppet_enc], enc_dir)
+      end
+
       def prepare_hiera_config
         return unless hiera_config
 

data/provisioner_options.md

@@ -57,7 +57,10 @@ puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted
 custom_options | | custom options to add to puppet apply command.
 custom_install_command | nil | Custom shell command to be used at install stage. Can be multiline. See examples below.
 puppet_whitelist_exit_code | nil | Whitelist exit code expected from puppet run. Intended to be used together with `puppet_detailed_exitcodes`.
-
+require_puppet_omnibus | false | Set if using omnibus puppet install
+puppet_omnibus_url | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet.sh | omnibus puppet v3 install location.
+_for puppet v4 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_agent.sh |
+puppet_enc | | path for external node classifier script
 
 ## Puppet Apply Configuring Provisioner Options
 

metadata

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