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

Merge pull request #2558 from ticosax/append-salt-bootstrap-options 

provisioners/salt: options are only allowed before install arguments
This commit is contained in:
Mitchell Hashimoto 2013-11-30 08:36:09 -08:00
parent cfb258a55b 7cd7077467
commit 6829ad1a08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,11 +79,6 @@ module VagrantPlugins
def bootstrap_options(install, configure, config_dir)
options = ""
## Any extra options passed to bootstrap
if @config.bootstrap_options
options = "%s %s" % [options, @config.bootstrap_options]
end
if configure
options = "%s -c %s" % [options, config_dir]
end
@ -126,6 +121,11 @@ module VagrantPlugins
end
end
## Any extra options passed to bootstrap
if @config.bootstrap_options
options = "%s %s" % [options, @config.bootstrap_options]
end
if @config.verbose
@machine.env.ui.info "Using Bootstrap Options: %s" % options
end