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

Fix "options are only allowed before install arguments" error. 

This reverts feb748f488 and 7cd7077467. `bootstrap_options` is
meant for flag options such as `-D`. This is demonstrated in the
example Vagrantfile from the original plugin:
github.com/saltstack/salty-vagrant/blob/develop/example/complete/Vagrantfile
Flag options must be appended to the options string before install
args such as `install_type` and `install_args`.
This commit is contained in:
A.J. Welch 2014-02-19 20:24:05 -08:00
parent f7629bb029
commit 9f0efc19a9
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