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

salt-bootstrap.sh: options are only allowed before install arguments

This commit is contained in:
Nicolas Delaby 2013-11-29 15:52:12 +01:00
parent cfb258a55b
commit 7cd7077467
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) def bootstrap_options(install, configure, config_dir)
options = "" options = ""
## Any extra options passed to bootstrap
if @config.bootstrap_options
options = "%s %s" % [options, @config.bootstrap_options]
end
if configure if configure
options = "%s -c %s" % [options, config_dir] options = "%s -c %s" % [options, config_dir]
end end
@ -126,6 +121,11 @@ module VagrantPlugins
end end
end end
## Any extra options passed to bootstrap
if @config.bootstrap_options
options = "%s %s" % [options, @config.bootstrap_options]
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
end end