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

Merge 97f9fb0ce0 into b231abe114

This commit is contained in:
Jan Vansteenkiste 2020-01-27 18:23:40 -05:00 committed by GitHub
parent b231abe114 97f9fb0ce0
commit 9b31dec6a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,11 @@ 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.synced_folder_args.is_a?(Hash)
folder_opts.merge!(@config.synced_folder_args)
else
folder_opts[:args] = @config.synced_folder_args if @config.synced_folder_args
end
folder_opts[:nfs__quiet] = true folder_opts[:nfs__quiet] = true
if @config.environment_path.is_a?(Array) if @config.environment_path.is_a?(Array)

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

@ -63,9 +63,9 @@ available below this section.
this will use the default synced folder type. For example, you can set this this will use the default synced folder type. For example, you can set this
to "nfs" to use NFS synced folders. to "nfs" to use NFS synced folders.
* `synced_folder_args` (array) - Arguments that are passed to the folder sync. * `synced_folder_args` (array or hash) - Arguments that are passed to the folder sync.
For example ['-a', '--delete', '--exclude=fixtures'] for the rsync sync For example ['-a', '--delete', '--exclude=fixtures'] for the rsync sync
command. command or { nfs_version: 4, nfs_udp: false } for the nfs mount.
* `temp_dir` (string) - The directory where all the data associated with * `temp_dir` (string) - The directory where all the data associated with
the Puppet run (manifest files, modules, etc.) will be stored on the the Puppet run (manifest files, modules, etc.) will be stored on the