kitchen-puppet 0.0.24 → 0.0.25

data/kitchen-puppet.gemspec

@@ -22,7 +22,7 @@ Puppet Provisioner for Test Kitchen
 
 == FEATURES:
 
-Supports puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet
+Supports puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet, puppet collections (v4) 
 
 EOF
 end

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '0.0.24'
+    VERSION = '0.0.25'
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -116,6 +116,7 @@ module Kitchen
             info("Installing puppet on #{puppet_platform}")
             <<-INSTALL
               if [ ! $(which puppet) ]; then
+                #{sudo('apt-get')} -y install wget
                 #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                 #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                 #{update_packages_debian_cmd}
@@ -148,6 +149,7 @@ module Kitchen
                     #{update_packages_redhat_cmd}
                     #{sudo('yum')} -y install puppet#{puppet_redhat_version}
                   else
+                    #{sudo('apt-get')} -y install wget
                     #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                     #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                     #{update_packages_debian_cmd}

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -39,10 +39,10 @@ module Kitchen
     class PuppetApply < Base
       attr_accessor :tmp_dir
 
-      default_config :require_puppet_omnibus, false
-      # TODO: use something like https://github.com/fnichol/omnibus-puppet
-      default_config :puppet_omnibus_url, nil
-      default_config :puppet_omnibus_remote_path, '/opt/puppet'
+      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 :puppet_coll_remote_path, '/opt/puppetlabs'
       default_config :puppet_version, nil
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
@@ -57,6 +57,7 @@ module Kitchen
       default_config :puppet_apply_command, nil
 
       default_config :http_proxy, nil
+      default_config :https_proxy, nil
 
       default_config :hiera_data_remote_path, '/var/lib/hiera'
       default_config :manifest, 'site.pp'
@@ -141,35 +142,20 @@ module Kitchen
           type == :directory ? File.directory?(c) : File.file?(c)
         end
       end
-
+      
       # TODO: refactor for smaller cyclomatic complexity and perceived complexity
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install_command
-        return unless config[:require_puppet_omnibus] || config[:require_puppet_repo]
-        if config[:require_puppet_omnibus]
-          info('Installing puppet using puppet omnibus')
-          if !config[:puppet_version].nil?
-            version = "-v #{config[:puppet_version]}"
-          else
-            version = ''
-          end
-          <<-INSTALL
-          #{Util.shell_helpers}
-
-          if [ ! -d "#{config[:puppet_omnibus_remote_path]}" ]; then
-            echo "-----> Installing Puppet Omnibus"
-            do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
-            #{sudo('sh')} /tmp/puppet_install.sh #{version}
-          fi
-          #{install_deep_merge}
-          #{install_busser}
-          INSTALL
+        return unless config[:require_puppet_collections] || config[:require_puppet_repo]
+        if config[:require_puppet_collections]
+           install_command_collections
         else
-          case puppet_platform
-          when 'debian', 'ubuntu'
+           case puppet_platform
+           when 'debian', 'ubuntu'
             info("Installing puppet on #{puppet_platform}")
             <<-INSTALL
               if [ ! $(which puppet) ]; then
+                #{sudo('apt-get')} -y install wget
                 #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                 #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                 #{update_packages_debian_cmd}
@@ -181,31 +167,32 @@ module Kitchen
               #{install_busser}
             INSTALL
           when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
-            info("Installing puppet on #{puppet_platform}")
-            <<-INSTALL
-              if [ ! $(which puppet) ]; then
-                #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
-                #{update_packages_redhat_cmd}
-                #{sudo_env('yum')} -y install puppet#{puppet_redhat_version}
-              fi
-              #{install_eyaml}
-              #{install_deep_merge}
-              #{install_busser}
-            INSTALL
+            info("Installing puppet from yum on #{puppet_platform}")
+             <<-INSTALL
+               if [ ! $(which puppet) ]; then
+                 #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
+                 #{update_packages_redhat_cmd}
+                 #{sudo_env('yum')} -y install puppet#{puppet_redhat_version}
+               fi
+               #{install_eyaml}
+               #{install_deep_merge}
+               #{install_busser}
+             INSTALL
           else
             info('Installing puppet, will try to determine platform os')
             <<-INSTALL
               if [ ! $(which puppet) ]; then
                 if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
-                  #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
-                  #{update_packages_redhat_cmd}
-                  #{sudo_env('yum')} -y install puppet#{puppet_redhat_version}
-                else
-                  if [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
                     #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
                     #{update_packages_redhat_cmd}
                     #{sudo_env('yum')} -y install puppet#{puppet_redhat_version}
+                else
+                  if [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
+                     #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
+                     #{update_packages_redhat_cmd}
+                     #{sudo_env('yum')} -y install puppet#{puppet_redhat_version}
                   else
+                    #{sudo('apt-get')} -y install wget
                     #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                     #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                     #{update_packages_debian_cmd}
@@ -219,9 +206,62 @@ module Kitchen
               #{install_busser}
             INSTALL
           end
-        end
-      end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        end  
+      end
+      
+      def install_command_collections
+         case puppet_platform
+         when 'debian', 'ubuntu'  
+              info("Installing Puppet Collections on #{puppet_platform}")
+              #{sudo('apt-get')} -y install wget
+              #{sudo('wget')} #{wget_proxy_parm} #{config[:puppet_apt_collections_repo]}
+              #{sudo('dpkg')} -i #{puppet_apt_coll_repo_file}
+          when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
+              info("Installing Puppet Collections on #{puppet_platform}")
+              <<-INSTALL
+              #{Util.shell_helpers}
+              if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
+                echo "-----> #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}"
+                #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}
+                #{sudo_env('yum')} -y install puppet
+             fi
+             #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
+             #{install_deep_merge}
+             #{install_busser}
+             INSTALL
+         else
+            info('Installing Puppet Collections, will try to determine platform os')
+            <<-INSTALL
+              if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
+                if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
+                   #{Util.shell_helpers}
+                   if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
+                     echo "-----> #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}"
+                     #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}
+                     #{sudo_env('yum')} -y install puppet
+                   fi 
+                else
+                  if [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
+                    #{Util.shell_helpers}
+                    if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
+                      echo "-----> #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}"
+                      #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}
+                      #{sudo_env('yum')} -y install puppet
+                    fi         
+                  else
+                    #{sudo('apt-get')} -y install wget
+                    #{sudo('wget')} #{wget_proxy_parm} #{config[:puppet_apt_collections_repo]}
+                    #{sudo('dpkg')} -i #{puppet_apt_coll_repo_file}
+                  fi
+                fi
+              fi
+              #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
+              #{install_deep_merge}
+              #{install_busser}                        
+            INSTALL
+         end
+      end 
+      
       def install_deep_merge
         return unless config[:hiera_deep_merge]
         <<-INSTALL
@@ -233,14 +273,14 @@ module Kitchen
         INSTALL
       end
 
-      def install_eyaml
+      def install_eyaml(gem_cmd='gem') 
         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
+          if [[ $(#{sudo(gem_cmd)} list hiera-eyaml -i) == 'false' ]]; then
             echo '-----> Installing hiera-eyaml to provide encryption of hiera data'
-            #{sudo('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc highline -v 1.6.21
-            #{sudo('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc hiera-eyaml
+            #{sudo(gem_cmd)} install #{gem_proxy_parm} --no-ri --no-rdoc highline -v 1.6.21
+            #{sudo(gem_cmd)} install #{gem_proxy_parm} --no-ri --no-rdoc hiera-eyaml
           fi
         INSTALL
       end
@@ -265,8 +305,9 @@ module Kitchen
       def init_command
         dirs = %w(modules manifests files hiera hiera.yaml)
         .map { |dir| File.join(config[:root_path], dir) }.join(' ')
-        cmd = "#{sudo('rm')} -rf #{dirs} #{hiera_data_remote_path} /etc/hiera.yaml /etc/puppet/hiera.yaml /etc/puppet/fileserver.conf;"
-        cmd += " mkdir -p #{config[:root_path]}"
+        cmd = "#{sudo('rm')} -rf #{dirs} #{hiera_data_remote_path} /etc/hiera.yaml #{puppet_dir}/hiera.yaml #{puppet_dir}/fileserver.conf;"
+        cmd += config[:puppet_environment] ? "#{sudo('rm')} -f #{File.join(puppet_dir, config[:puppet_environment])};" : ''
+        cmd += " mkdir -p #{config[:root_path]} #{puppet_dir}"
         debug(cmd)
         cmd
       end
@@ -299,7 +340,7 @@ module Kitchen
           commands << [
             sudo('cp'),
             File.join(config[:root_path], 'puppet.conf'),
-            '/etc/puppet'
+            puppet_dir
           ].join(' ')
         end
 
@@ -309,7 +350,7 @@ module Kitchen
           ].join(' ')
 
           commands << [
-            sudo('cp'), File.join(config[:root_path], 'hiera.yaml'), '/etc/puppet/'
+            sudo('cp'), File.join(config[:root_path], 'hiera.yaml'), puppet_dir
           ].join(' ')
         end
 
@@ -317,7 +358,7 @@ module Kitchen
           commands << [
             sudo('cp'),
             File.join(config[:root_path], 'fileserver.conf'),
-            '/etc/puppet'
+            puppet_dir
           ].join(' ')
         end
 
@@ -345,6 +386,12 @@ module Kitchen
           ].join(' ')
         end
 
+        if puppet_environment
+          commands << [
+            sudo('ln -s '),  config[:root_path], File.join(puppet_dir, config[:puppet_environment])
+          ].join(' ')
+        end 
+        
         command = commands.join(' && ')
         debug(command)
         command
@@ -358,11 +405,11 @@ module Kitchen
           [
             custom_facts,
             facter_facts,
-            sudo_env('puppet'),
+            puppet_cmd,
             'apply',
             File.join(config[:root_path], 'manifests', manifest),
             "--modulepath=#{File.join(config[:root_path], 'modules')}",
-            "--manifestdir=#{File.join(config[:root_path], 'manifests')}",
+            puppet_manifestdir,
             "--fileserverconfig=#{File.join(config[:root_path], 'fileserver.conf')}",
             puppet_environment_flag,
             puppet_noop_flag,
@@ -460,6 +507,22 @@ module Kitchen
         config[:librarian_puppet_ssl_file]
       end
 
+      def puppet_cmd 
+       if config[:require_puppet_collections]
+         sudo_env("#{config[:puppet_coll_remote_path]}/bin/puppet")
+       else
+         sudo_env('puppet')
+       end
+      end 
+
+      def puppet_dir 
+       if config[:require_puppet_collections]
+         '/etc/puppetlabs/puppet'
+       else
+         '/etc/puppet'
+       end
+      end  
+      
       def puppet_debian_version
         config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
       end
@@ -468,8 +531,12 @@ module Kitchen
         config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
       end
 
-      def puppet_environment_flag
-        config[:puppet_environment] ? "--environment=#{config[:puppet_environment]}" : nil
+      def puppet_environment_flag        
+        config[:puppet_environment] ? "--environment=#{config[:puppet_environment]} --environmentpath=#{puppet_dir}" : nil
+      end
+
+      def puppet_manifestdir
+        config[:puppet_environment] ? nil : "--manifestdir=#{File.join(config[:root_path], 'manifests')}"
       end
 
       def puppet_noop_flag
@@ -518,7 +585,9 @@ module Kitchen
       end
 
       def sudo_env(pm)
-        http_proxy ? "#{sudo('env')} http_proxy=#{http_proxy} #{pm}" : "#{sudo(pm)}"
+        s = https_proxy ? "https_proxy=#{https_proxy}" : nil
+        p = http_proxy ? "http_proxy=#{http_proxy}" : nil
+        p || s  ? "#{sudo('env')} #{p} #{s} #{pm}" : "#{sudo(pm)}"
       end
 
       def remove_puppet_repo
@@ -538,7 +607,7 @@ module Kitchen
       end
 
       def remove_repo
-        remove_puppet_repo ? "; #{sudo('rm')} -rf /tmp/kitchen #{hiera_data_remote_path} #{hiera_eyaml_key_remote_path} /etc/puppet/* " : nil
+        remove_puppet_repo ? "; #{sudo('rm')} -rf /tmp/kitchen #{hiera_data_remote_path} #{hiera_eyaml_key_remote_path} #{puppet_dir}/* " : nil
       end
 
       def puppet_apt_repo
@@ -548,6 +617,10 @@ module Kitchen
       def puppet_apt_repo_file
         config[:puppet_apt_repo].split('/').last
       end
+      
+      def puppet_apt_coll_repo_file
+        config[:puppet_apt_collections_repo].split('/').last
+      end      
 
       def puppet_yum_repo
         config[:puppet_yum_repo]
@@ -562,12 +635,18 @@ module Kitchen
       end
 
       def wget_proxy_parm
-        http_proxy ?  "-e use_proxy=yes -e http_proxy=#{http_proxy}" : nil
+        p = http_proxy ?  "-e http_proxy=#{http_proxy}" : nil
+        s = https_proxy ? "-e http_proxy=#{http_proxy}" : nil
+        p || s  ? "-e use_proxy=yes #{p} #{s}" : nil
       end
 
       def http_proxy
         config[:http_proxy]
       end
+      
+      def https_proxy
+        config[:https_proxy]
+      end
 
       def chef_url
         config[:chef_bootstrap_url]

data/provisioner_options.md

@@ -8,9 +8,10 @@ puppet_platform | naively tries to determine | 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
-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.
+require_puppet_collections | false | Set if using puppet collections install (Puppet v4)
+puppet_yum_collections_repo | "http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm" | yum collections repo
+puppet_apt_collections_repo | "http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb" | apt collections repo
+puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a puppet collections install.
 puppet_detailed_exitcodes | nil | Provide transaction information via exit codes.
 manifests_path | | puppet repo manifests directory
 manifest | 'site.pp' | manifest for puppet apply to run
@@ -33,16 +34,18 @@ require_chef_for_busser | true | Install chef as currently needed by busser to r
 resolve_with_librarian_puppet | true | Use librarian_puppet to resolve modules if a Puppetfile is found
 librarian_puppet_ssl_file | nil | ssl certificate file for librarian-puppet
 puppet_config_path | | path of custom puppet.conf file
-puppet_environment | nil | puppet environment for running puppet apply
+puppet_environment | nil | puppet environment for running puppet apply (Must set if using Puppet v4)
 remove_puppet_repo | false | remove copy of puppet repository and puppet configuration on server after running puppet
 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
+http_proxy | nil | use http proxy when installing puppet, packages and running puppet
+https_proxy | nil | use https proxy when installing puppet, packages and running puppet
 puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted
 
+
 ## Puppet Apply Configuring Provisioner Options
 
 The provisioner can be configured globally or per suite, global settings act as defaults for all suites, you can then customise per suite, for example:
@@ -126,6 +129,8 @@ puppet_config_path | | path of custom puppet.conf file
 http_proxy | nil | use http proxy when installing puppet and packages
 
 
+NOTE: Puppet Collections Support not in puppet agent yet
+
 ## Puppet Agent Configuring Provisioner Options
 
 The provisioner can be configured globally or per suite, global settings act as defaults for all suites, you can then customise per suite, for example:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,21 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies: []
-description: ! '== DESCRIPTION:
-
-
-  Puppet Provisioner for Test Kitchen
-
-
-  == FEATURES:
-
-
-  Supports puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet
-
-
-'
+description: ! "== DESCRIPTION:\n\nPuppet Provisioner for Test Kitchen\n\n== FEATURES:\n\nSupports
+  puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet,
+  puppet collections (v4) \n\n"
 email:
 - neillwturner@gmail.com
 executables: []