Merge pull request #5359 from choffee/fix/master/puppet_folder_sync_args

This commit is contained in:
Seth Vargo 2015-05-30 21:26:51 -07:00
commit a382944b07
3 changed files with 10 additions and 4 deletions

View File

@ -16,6 +16,7 @@ module VagrantPlugins
attr_accessor :module_path
attr_accessor :options
attr_accessor :synced_folder_type
attr_accessor :synced_folder_args
attr_accessor :temp_dir
attr_accessor :working_directory
@ -91,9 +92,9 @@ module VagrantPlugins
@binary_path = nil if @binary_path == UNSET_VALUE
@module_path = nil if @module_path == 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
@working_directory = nil if @working_directory == UNSET_VALUE
end
# Returns the module paths as an array of paths expanded relative to the

View File

@ -31,6 +31,7 @@ module VagrantPlugins
folder_opts = {}
folder_opts[:type] = @config.synced_folder_type 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)
# Share the environments directory with the guest

View File

@ -58,6 +58,10 @@ available below this section.
this will use the default synced folder type. For example, you can set this
to "nfs" to use NFS synced folders.
* `synced_folder_args` (array) - Arguments that are passed to the folder sync.
For example ['-a', '--delete', '--exclude=fixtures'] for the rsync sync
command.
* `temp_dir` (string) - The directory where all the data associated with
the Puppet run (manifest files, modules, etc.) will be stored on the
guest machine.