kitchen-puppet 0.0.18 → 0.0.20

data/README.md

@@ -1,21 +1,25 @@
-# kitchen-puppet
-A Test Kitchen Provisioner for Puppet
-
-The providers supports both puppet apply and puppet agent clients
-
-The PuppetApply provider works by passing the puppet repository based on attributes in .kitchen.yml & calling puppet apply.
-
-The PuppetAgent provider works by passing the puppetmaster and other attributes in .kitchen.yml & calling puppet agent.
-
-
-This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox.
-
-## Requirements
-You'll need a driver box without a chef installation so puppet can be installed. Puppet have one at http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box or http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box.
-
-For PuppetAgent a server with a puppet master is required that can resolve the hostname ip address of the server. The server must also be able to resolve the hostname ip address of the puppet master.  
-
-## Installation & Setup
-You'll need the test-kitchen & kitchen-puppet gem's installed in your system, along with kitchen-vagrant or some ther suitable driver for test-kitchen. 
-
-Please see the Provisioner Options (https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md).
+# Kitchen Puppet
+
+[![Gem Version](https://badge.fury.io/rb/kitchen-puppet.svg)](http://badge.fury.io/rb/kitchen-puppet)
+
+# kitchen-puppet
+A Test Kitchen Provisioner for Puppet
+
+The providers supports both puppet apply and puppet agent clients
+
+The PuppetApply provider works by passing the puppet repository based on attributes in .kitchen.yml & calling puppet apply.
+
+The PuppetAgent provider works by passing the puppetmaster and other attributes in .kitchen.yml & calling puppet agent.
+
+
+This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox.
+
+## Requirements
+You'll need a driver box without a chef installation so puppet can be installed. Puppet have one at http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box or http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box.
+
+For PuppetAgent a server with a puppet master is required that can resolve the hostname ip address of the server. The server must also be able to resolve the hostname ip address of the puppet master.  
+
+## Installation & Setup
+You'll need the test-kitchen & kitchen-puppet gem's installed in your system, along with kitchen-vagrant or some ther suitable driver for test-kitchen. 
+
+Please see the Provisioner Options (https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md).

data/kitchen-puppet.gemspec

@@ -25,5 +25,4 @@ Puppet Provisioner for Test Kitchen
 Supports puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet
 
 EOF
-
 end

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '0.0.18'
+    VERSION = '0.0.20'
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -51,7 +51,7 @@ module Kitchen
       default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
 
       default_config :puppet_agent_command, nil
-      
+
       default_config :http_proxy, nil
 
       default_config :puppet_config_path do |provisioner|
@@ -280,10 +280,10 @@ module Kitchen
       def update_packages_redhat_cmd
         config[:update_package_repos] ? "#{sudo_env('yum')} makecache" : nil
       end
-      
+
       def sudo_env(pm)
         http_proxy ? "#{sudo('env')} http_proxy=#{http_proxy} #{pm}" : "#{sudo(pm)}"
-      end       
+      end
 
       def custom_facts
         return nil if config[:custom_facts].none?
@@ -348,22 +348,22 @@ module Kitchen
       def puppet_yum_repo
         config[:puppet_yum_repo]
       end
-      
-      def proxy_parm 
-         http_proxy ? "--httpproxy #{URI.parse(http_proxy).host.downcase} --httpport #{URI.parse(http_proxy).port} " : nil
-      end 
-      
-      def gem_proxy_parm 
-         http_proxy ?  "--http-proxy #{http_proxy}" : nil
-       end  
-  
-      def wget_proxy_parm 
-         http_proxy ?  "-e use_proxy=yes -e http_proxy=#{http_proxy}" : nil
-      end
-      
+
+      def proxy_parm
+        http_proxy ? "--httpproxy #{URI.parse(http_proxy).host.downcase} --httpport #{URI.parse(http_proxy).port} " : nil
+      end
+
+      def gem_proxy_parm
+        http_proxy ?  "--http-proxy #{http_proxy}" : nil
+      end
+
+      def wget_proxy_parm
+        http_proxy ?  "-e use_proxy=yes -e http_proxy=#{http_proxy}" : nil
+      end
+
       def http_proxy
         config[:http_proxy]
-      end            
+      end
 
       def chef_url
         config[:chef_bootstrap_url]

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -48,12 +48,13 @@ module Kitchen
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
       default_config :puppet_environment, nil
+      default_config :install_custom_facts, false
       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'
 
       default_config :puppet_apply_command, nil
-      
+
       default_config :http_proxy, nil
 
       default_config :hiera_data_remote_path, '/var/lib/hiera'
@@ -91,7 +92,6 @@ module Kitchen
       default_config :fileserver_config_path do |provisioner|
         provisioner.calculate_path('fileserver.conf', :file)
       end
-
       default_config :puppetfile_path do |provisioner|
         provisioner.calculate_path('Puppetfile', :file)
       end
@@ -115,6 +115,7 @@ module Kitchen
       default_config :update_package_repos, true
       default_config :remove_puppet_repo, false
       default_config :custom_facts, {}
+      default_config :puppet_detailed_exitcodes, nil
       default_config :facter_file, nil
       default_config :librarian_puppet_ssl_file, nil
 
@@ -257,6 +258,7 @@ module Kitchen
         prepare_modules
         prepare_manifests
         prepare_files
+        prepare_facts
         prepare_puppet_config
         prepare_hiera_config
         prepare_fileserver_config
@@ -344,6 +346,7 @@ module Kitchen
             "--fileserverconfig=#{File.join(config[:root_path], 'fileserver.conf')}",
             puppet_environment_flag,
             puppet_noop_flag,
+            puppet_detailed_exitcodes_flag,
             puppet_verbose_flag,
             puppet_debug_flag,
             remove_repo
@@ -462,12 +465,12 @@ module Kitchen
 
       def facter_facts
         return nil unless config[:facter_file]
-        fact_vars = "export "
+        fact_vars = 'export '
         fact_hash = YAML.load_file(config[:facter_file])
         fact_hash.each do |key, value|
           fact_vars << "FACTER_#{key}=#{value} "
         end
-        fact_vars << ";"
+        fact_vars << ';'
         fact_vars
       end
 
@@ -476,13 +479,13 @@ module Kitchen
       end
 
       def update_packages_redhat_cmd
-      # #{sudo('yum')} 
+        # #{sudo('yum')}
         config[:update_package_repos] ? "#{sudo_env('yum')} makecache" : nil
       end
-      
+
       def sudo_env(pm)
         http_proxy ? "#{sudo('env')} http_proxy=#{http_proxy} #{pm}" : "#{sudo(pm)}"
-      end 
+      end
 
       def remove_puppet_repo
         config[:remove_puppet_repo]
@@ -496,6 +499,10 @@ module Kitchen
         bash_vars
       end
 
+      def puppet_detailed_exitcodes_flag
+        config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
+      end
+
       def remove_repo
         remove_puppet_repo ? "; #{sudo('rm')} -rf /tmp/kitchen #{hiera_data_remote_path} #{hiera_eyaml_key_remote_path} /etc/puppet/* " : nil
       end
@@ -511,22 +518,22 @@ module Kitchen
       def puppet_yum_repo
         config[:puppet_yum_repo]
       end
-      
-      def proxy_parm 
-         http_proxy ?  "--httpproxy #{URI.parse(http_proxy).host.downcase} --httpport #{URI.parse(http_proxy).port} " : nil
-      end 
-      
-      def gem_proxy_parm 
-         http_proxy ?  "--http-proxy #{http_proxy}" : nil
-      end  
-  
-      def wget_proxy_parm 
-         http_proxy ?  "-e use_proxy=yes -e http_proxy=#{http_proxy}" : nil
-      end
-      
+
+      def proxy_parm
+        http_proxy ?  "--httpproxy #{URI.parse(http_proxy).host.downcase} --httpport #{URI.parse(http_proxy).port} " : nil
+      end
+
+      def gem_proxy_parm
+        http_proxy ?  "--http-proxy #{http_proxy}" : nil
+      end
+
+      def wget_proxy_parm
+        http_proxy ?  "-e use_proxy=yes -e http_proxy=#{http_proxy}" : nil
+      end
+
       def http_proxy
         config[:http_proxy]
-      end      
+      end
 
       def chef_url
         config[:chef_bootstrap_url]
@@ -555,6 +562,19 @@ module Kitchen
         FileUtils.cp_r(Dir.glob("#{files}/*"), tmp_files_dir)
       end
 
+      def prepare_facts
+        return unless config[:install_custom_facts]
+        return unless config[:custom_facts]
+        info 'installing custom facts'
+        facter_dir = File.join(sandbox_path, 'facter')
+        FileUtils.mkdir_p(facter_dir)
+        tmp_facter_file = File.join(facter_dir, 'kitchen.yaml')
+        facter_facts = config[:custom_facts]
+        File.open(tmp_facter_file, 'w') do |out|
+          YAML.dump(facter_facts, out)
+        end
+      end
+
       def prepare_modules
         info('Preparing modules')
 

data/provisioner_options.md

@@ -11,6 +11,7 @@ puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
 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.
+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
 modules_path | | puppet repo manifests directory
@@ -24,6 +25,7 @@ puppet_verbose| false| Extra information logging on puppet run
 puppet_noop| false| puppet runs in a no-op or dry-run mode
 update_package_repos| true| update OS repository metadata
 custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
+install_custom_facts| false | Install custom facts to yaml file at "/tmp/kitchen/facter/kitchen.yaml"
 chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
 puppetfile_path | | Path to Puppetfile
 puppet_apply_command | nil | Overwrite the puppet apply command. Needs "sudo -E puppet apply" as a prefix. 
@@ -160,4 +162,4 @@ To override a setting at the suite-level, specify the setting name under the sui
 
     suites:
      - name: default
-       manifest: foobar.pp
+       manifest: foobar.pp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: