Puppet retains default module path even when custom is set [GH-1207]
This commit is contained in:
parent
ec1bae0ae7
commit
6babeb4188
|
@ -1,5 +1,10 @@
|
|||
## 1.1.3 (unreleased)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- Puppet apply provisioner now retains the default module path
|
||||
even while specifying custom module paths. [GH-1207]
|
||||
|
||||
BUG FIXES:
|
||||
|
||||
- Attempt to re-establish SSH connection on `Net::SSH::Disconnect`
|
||||
|
|
|
@ -70,7 +70,14 @@ module VagrantPlugins
|
|||
def run_puppet_apply
|
||||
options = [config.options].flatten
|
||||
module_paths = @module_paths.map { |_, to| to }
|
||||
options << "--modulepath '#{module_paths.join(':')}'" 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
|
||||
options << "--modulepath '#{module_paths.join(':')}'"
|
||||
end
|
||||
|
||||
options << @manifest_file
|
||||
options = options.join(" ")
|
||||
|
||||
|
|
Loading…
Reference in New Issue