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

Added synced_folder_args to puppet provisioner

This commit is contained in:
John Cooper 2015-02-11 12:52:11 +00:00 committed by Seth Vargo
parent b19f5f8df7
commit 7f716f4b63
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ module VagrantPlugins
attr_accessor :module_path attr_accessor :module_path
attr_accessor :options attr_accessor :options
attr_accessor :synced_folder_type attr_accessor :synced_folder_type
attr_accessor :synced_folder_args
attr_accessor :temp_dir attr_accessor :temp_dir
attr_accessor :working_directory attr_accessor :working_directory
@ -91,9 +92,9 @@ module VagrantPlugins
@binary_path = nil if @binary_path == UNSET_VALUE @binary_path = nil if @binary_path == UNSET_VALUE
@module_path = nil if @module_path == UNSET_VALUE @module_path = nil if @module_path == UNSET_VALUE
@synced_folder_type = nil if @synced_folder_type == UNSET_VALUE @synced_folder_type = nil if @synced_folder_type == UNSET_VALUE
@synced_folder_args = nil if @synced_folder_args == UNSET_VALUE
@temp_dir = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE @temp_dir = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE
@working_directory = nil if @working_directory == UNSET_VALUE @working_directory = nil if @working_directory == UNSET_VALUE
end end
# Returns the module paths as an array of paths expanded relative to the # Returns the module paths as an array of paths expanded relative to the

1
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -31,6 +31,7 @@ module VagrantPlugins
folder_opts = {} folder_opts = {}
folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type
folder_opts[:owner] = "root" if !@config.synced_folder_type folder_opts[:owner] = "root" if !@config.synced_folder_type
folder_opts[:args] = @config.synced_folder_args if @config.synced_folder_args
if @config.environment_path.is_a?(Array) if @config.environment_path.is_a?(Array)
# Share the environments directory with the guest # Share the environments directory with the guest