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

provisioners/salt: style nitpicks

This commit is contained in:
Mitchell Hashimoto 2014-03-12 20:04:57 -07:00
parent a8fa2d5ffe
commit b0f8d050f0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ module VagrantPlugins
def bootstrap_options(install, configure, config_dir) def bootstrap_options(install, configure, config_dir)
options = "" options = ""
## Any extra options passed to bootstrap # Any extra options passed to bootstrap
if @config.bootstrap_options if @config.bootstrap_options
options = "%s %s" % [options, @config.bootstrap_options] options = "%s %s" % [options, @config.bootstrap_options]
end end
@ -88,7 +88,7 @@ module VagrantPlugins
options = "%s -c %s" % [options, config_dir] options = "%s -c %s" % [options, config_dir]
end end
if @config.seed_master and @config.install_master if @config.seed_master && @config.install_master
seed_dir = "/tmp/minion-seed-keys" seed_dir = "/tmp/minion-seed-keys"
@machine.communicate.sudo("mkdir -p -m777 #{seed_dir}") @machine.communicate.sudo("mkdir -p -m777 #{seed_dir}")
@config.seed_master.each do |name, keyfile| @config.seed_master.each do |name, keyfile|
@ -99,16 +99,13 @@ module VagrantPlugins
options = "#{options} -k #{seed_dir}" options = "#{options} -k #{seed_dir}"
end end
if configure and !install if configure && !install
options = "%s -C" % options options = "%s -C" % options
else else
if @config.install_master if @config.install_master
options = "%s -M" % options options = "%s -M" % options
end end
if @config.install_syndic if @config.install_syndic
options = "%s -S" % options options = "%s -S" % options
end end