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

The various `install` args should always be passed to salt-bootstrap. 

Even when preforming config only, the install flags (i.e. -M, -S, -N),
are used by the bootstrap to determine which configs to copy.

This should help with #3542 and should supersede #3548.
This commit is contained in:
Timothy Messier 2014-04-27 12:29:13 -04:00
parent de6ad1d5d3
commit b93c6df956
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ module VagrantPlugins
if configure && !install if configure && !install
options = "%s -C" % options options = "%s -C" % options
else
if @config.install_master if @config.install_master
options = "%s -M" % options options = "%s -M" % options
end end
@ -126,7 +126,6 @@ module VagrantPlugins
if @config.install_args if @config.install_args
options = "%s %s" % [options, @config.install_args] options = "%s %s" % [options, @config.install_args]
end end
end
if @config.verbose if @config.verbose
@machine.env.ui.info "Using Bootstrap Options: %s" % options @machine.env.ui.info "Using Bootstrap Options: %s" % options