kitchen-puppet 0.0.13 → 0.0.14

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -47,7 +47,8 @@ module Kitchen
       default_config :puppet_version, nil
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
-	  default_config :resolve_with_librarian_puppet, true	  
+      default_config :resolve_with_librarian_puppet, true
+      default_config :puppet_environment, nil
       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"
@@ -305,6 +306,7 @@ module Kitchen
               "--modulepath=#{File.join(config[:root_path], 'modules')}",
               "--manifestdir=#{File.join(config[:root_path], 'manifests')}",
               "--fileserverconfig=#{File.join(config[:root_path], 'fileserver.conf')}",
+              puppet_environment_flag,
               puppet_noop_flag,
               puppet_verbose_flag,
               puppet_debug_flag,
@@ -356,7 +358,11 @@ module Kitchen
         def puppet_config
           config[:puppet_config_path]
         end
-
+        
+        def puppet_environment
+          config[:puppet_environment]
+        end
+        
         def hiera_config
           config[:hiera_config_path]
         end
@@ -381,6 +387,10 @@ module Kitchen
           config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
         end
 
+        def puppet_environment_flag
+          config[:puppet_environment] ? "--environment=#{config[:puppet_environment]}" : nil
+        end
+
         def puppet_noop_flag
           config[:puppet_noop] ? '--noop' : nil
         end

data/lib/kitchen-puppet/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Puppet
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/provisioner_options.md

@@ -29,6 +29,8 @@ puppetfile_path | | Path to Puppetfile
 puppet_apply_command | nil | Overwrite the puppet apply command. Needs "sudo -E puppet apply" as a prefix. 
 require_chef_for_busser | true | Install chef as currently needed by busser to run tests 
 resolve_with_librarian_puppet | true | Use librarian_puppet to resolve modules if a Puppetfile is found 
+puppet_config_path | | path of custom puppet.conf file 
+puppet_environment | nil | puppet environment for running puppet apply 
 
 ## Configuring Provisioner Options
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: