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

Merge pull request #3005 from ajw0100/fix-salt-options-error 

provisioners/salt: Fix "options are only allowed before install arguments" error.
This commit is contained in:
Mitchell Hashimoto 2014-02-23 21:25:42 -08:00
parent 399a3e48da 9f0efc19a9
commit 5ebe007ddc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,8 +79,13 @@ 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 = " -c %s %s" % [config_dir, options] options = "%s -c %s" % [options, config_dir]
end end
if @config.seed_master and @config.install_master if @config.seed_master and @config.install_master
@ -121,11 +126,6 @@ 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