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

Merge pull request #2677 from purpleidea/fix_puppet_apply 

provisioner/puppet: do not prepend default path because it can override modules.
This commit is contained in:
Mitchell Hashimoto 2013-12-18 08:31:21 -08:00
parent 8dbad22d72 d4c76d1bcf
commit 9ac4ec85dd
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,9 +98,6 @@ module VagrantPlugins
options = [config.options].flatten options = [config.options].flatten
module_paths = @module_paths.map { |_, to| to } module_paths = @module_paths.map { |_, to| to }
if !@module_paths.empty? if !@module_paths.empty?
# Prepend the default module path
module_paths.unshift("/etc/puppet/modules")
# Add the command line switch to add the module path # Add the command line switch to add the module path
options << "--modulepath '#{module_paths.join(':')}'" options << "--modulepath '#{module_paths.join(':')}'"
end end