kitchen-puppet 0.0.22 → 0.0.23

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '0.0.22'
+    VERSION = '0.0.23'
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -127,6 +127,8 @@ module Kitchen
         provisioner.calculate_path('hiera_keys')
       end
 
+      default_config :hiera_deep_merge, false
+
       def calculate_path(path, type = :directory)
         base = config[:test_base_path]
         candidates = []
@@ -159,6 +161,7 @@ module Kitchen
             do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
             #{sudo('sh')} /tmp/puppet_install.sh #{version}
           fi
+          #{install_deep_merge}
           #{install_busser}
           INSTALL
         else
@@ -173,6 +176,8 @@ module Kitchen
                 #{sudo_env('apt-get')} -y install puppet-common#{puppet_debian_version}
                 #{sudo_env('apt-get')} -y install puppet#{puppet_debian_version}
               fi
+              #{install_eyaml}
+              #{install_deep_merge}
               #{install_busser}
             INSTALL
           when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
@@ -183,6 +188,8 @@ module Kitchen
                 #{update_packages_redhat_cmd}
                 #{sudo_env('yum')} -y install puppet#{puppet_redhat_version}
               fi
+              #{install_eyaml}
+              #{install_deep_merge}
               #{install_busser}
             INSTALL
           else
@@ -208,19 +215,30 @@ module Kitchen
                 fi
               fi
               #{install_eyaml}
+              #{install_deep_merge}
               #{install_busser}
             INSTALL
           end
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def install_deep_merge
+        return unless config[:hiera_deep_merge]
+        <<-INSTALL
+          # Support for hash merge lookups to recursively merge hash keys
+          if [[ $(#{sudo('gem')} list deep_merge -i) == 'false' ]]; then
+            echo '-----> Installing deep_merge to provide deep_merge of hiera hashes'
+            #{sudo('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc deep_merge
+          fi
+        INSTALL
+      end
 
       def install_eyaml
         return unless config[:hiera_eyaml]
         <<-INSTALL
           # A backend for Hiera that provides per-value asymmetric encryption of sensitive data
           if [[ $(#{sudo('gem')} list hiera-eyaml -i) == 'false' ]]; then
-            echo "-----> Installing hiera-eyaml to provide encryption of hiera data"
+            echo '-----> Installing hiera-eyaml to provide encryption of hiera data'
             #{sudo('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc hiera-eyaml
           fi
         INSTALL
@@ -236,7 +254,7 @@ module Kitchen
           # whole chef client
           if [ ! -d "/opt/chef" ]
           then
-            echo "-----> Installing Chef Omnibus to install busser to run tests"
+            echo '-----> Installing Chef Omnibus to install busser to run tests'
             do_download #{chef_url} /tmp/install.sh
             #{sudo('sh')} /tmp/install.sh
           fi
@@ -433,6 +451,10 @@ module Kitchen
         config[:hiera_eyaml_key_remote_path]
       end
 
+      def hiera_deep_merge
+        config[:hiera_deep_merge]
+      end
+
       def librarian_puppet_ssl_file
         config[:librarian_puppet_ssl_file]
       end

data/provisioner_options.md

@@ -38,6 +38,7 @@ remove_puppet_repo | false | remove copy of puppet repository and puppet configu
 hiera_eyaml | false | use hiera-eyaml to encrypt hiera data
 hiera_eyaml_key_remote_path | "/etc/puppet/secure/keys" | directory of hiera-eyaml keys on server
 hiera_eyaml_key_path  | "hiera_keys" | directory of hiera-eyaml keys on workstation
+hiera_deep_merge | false | install the deep_merge gem to support hiera deep merge mode
 facter_file | nil | yaml file of custom facter_files to be provided to the puppet-apply command
 http_proxy | nil | use http proxy when installing puppet and packages
 puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: