From fec6ef11c82e45fd32e58118121f2f622e9c9973 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 6 Jul 2015 11:19:32 -0600 Subject: [PATCH] provisioners/puppet: just quiet the NFS errors for Puppet [GH-5456] --- plugins/kernel_v2/config/vm.rb | 2 +- plugins/provisioners/puppet/provisioner/puppet.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 294a63e19..9f41ce184 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -620,7 +620,7 @@ module VagrantPlugins path: options[:hostpath]) end - if options[:type] == :nfs + if options[:type] == :nfs && !options[:nfs__quiet] if options[:owner] || options[:group] # Owner/group don't work with NFS errors << I18n.t("vagrant.config.vm.shared_folder_nfs_owner_group", diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 05d7d2bd8..67954ca77 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -32,6 +32,7 @@ module VagrantPlugins 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 + folder_opts[:nfs__quiet] = true if @config.environment_path.is_a?(Array) # Share the environments directory with the guest