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

Merge pull request #3557 from shadowfax-chc/correct-bootstrap-args 

provisioner/salt: correct bootstrap args
This commit is contained in:
Mitchell Hashimoto 2014-04-27 15:49:37 -07:00
parent de6ad1d5d3 adeaf29487
commit f9731ef571
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,26 +106,26 @@ module VagrantPlugins
if configure && !install
options = "%s -C" % options
else
if @config.install_master
options = "%s -M" % options
end
end
if @config.install_syndic
options = "%s -S" % options
end
if @config.install_master
options = "%s -M" % options
end
if @config.no_minion
options = "%s -N" % options
end
if @config.install_syndic
options = "%s -S" % options
end
if @config.install_type
options = "%s %s" % [options, @config.install_type]
end
if @config.no_minion
options = "%s -N" % options
end
if @config.install_args
options = "%s %s" % [options, @config.install_args]
end
if @config.install_type
options = "%s %s" % [options, @config.install_type]
end
if @config.install_args
options = "%s %s" % [options, @config.install_args]
end
if @config.verbose