haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add support for environment variables on a puppet apply run

This commit is contained in:
Azul 2016-04-23 18:12:52 +01:00 committed by Chris Roberts
parent fff1c72684
commit a4408037ba
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/provisioners/puppet/config/puppet.rb
View File

@ -13,6 +13,7 @@ module VagrantPlugins
attr_accessor :manifests_path attr_accessor :manifests_path
attr_accessor :environment attr_accessor :environment
attr_accessor :environment_path attr_accessor :environment_path
attr_accessor :environment_variables
attr_accessor :module_path attr_accessor :module_path
attr_accessor :options attr_accessor :options
attr_accessor :synced_folder_type attr_accessor :synced_folder_type
@ -29,6 +30,7 @@ module VagrantPlugins
@manifests_path = UNSET_VALUE @manifests_path = UNSET_VALUE
@environment = UNSET_VALUE @environment = UNSET_VALUE
@environment_path = UNSET_VALUE @environment_path = UNSET_VALUE
@environment_variables = UNSET_VALUE
@module_path = UNSET_VALUE @module_path = UNSET_VALUE
@options = [] @options = []
@facter = {} @facter = {}
@ -85,6 +87,9 @@ module VagrantPlugins
if @manifest_file == UNSET_VALUE if @manifest_file == UNSET_VALUE
@manifest_file = nil @manifest_file = nil
end end
if @environment_variables == UNSET_VALUE
@environment_variables = nil
end
end end
@binary_path = nil if @binary_path == UNSET_VALUE @binary_path = nil if @binary_path == UNSET_VALUE

3
website/source/docs/provisioning/puppet_apply.html.md
View File

@ -52,6 +52,9 @@ available below this section.
* `environment_path` (string) - Path to the directory that contains environment * `environment_path` (string) - Path to the directory that contains environment
files on the host disk. files on the host disk.
* `environment_variables` (hash) - A hash of data to be set as environment
variables before the puppet apply run.
* `options` (array of strings) - Additionally options to pass to the * `options` (array of strings) - Additionally options to pass to the
Puppet executable when running Puppet. Puppet executable when running Puppet.