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

provisioners/puppet: append module path (default) [GH-2677]

This commit is contained in:
Mitchell Hashimoto 2014-02-24 08:09:24 -08:00
parent 32c45aa70b
commit 12c740898c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -112,6 +112,8 @@ BUG FIXES:
isn't already in it. [GH-2838] isn't already in it. [GH-2838]
- provisioners/docker: Configuring autostart works properly with - provisioners/docker: Configuring autostart works properly with
the newest versions of Docker. [GH-2874] the newest versions of Docker. [GH-2874]
- provisioners/puppet: Append default module path to the module paths
always. [GH-2677]
- provisioners/salt: Options can now set install type and install args. - provisioners/salt: Options can now set install type and install args.
[GH-2766] [GH-2766]
- provisioners/salt: Fix case when salt would say "options only allowed - provisioners/salt: Fix case when salt would say "options only allowed

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

@ -98,8 +98,8 @@ 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 # Append the default module path
module_paths.unshift("/etc/puppet/modules") module_paths << "/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(':')}'"