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

provisioners/salt: whitespace

This commit is contained in:
Mitchell Hashimoto 2014-08-06 11:05:03 -07:00
parent ef2cd4ed18
commit 3bc5ecfbd0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ module VagrantPlugins
else else
bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh") bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh")
end end
@machine.communicate.sudo("rm -f %s" % bootstrap_destination) @machine.communicate.sudo("rm -f %s" % bootstrap_destination)
@machine.communicate.upload(bootstrap_path.to_s, bootstrap_destination) @machine.communicate.upload(bootstrap_path.to_s, bootstrap_destination)
@machine.communicate.sudo("chmod +x %s" % bootstrap_destination) @machine.communicate.sudo("chmod +x %s" % bootstrap_destination)
@ -266,7 +266,7 @@ module VagrantPlugins
if !bootstrap if !bootstrap
raise Salt::Errors::SaltError, :bootstrap_failed raise Salt::Errors::SaltError, :bootstrap_failed
end end
if configure and !install if configure and !install
@machine.env.ui.info "Salt successfully configured!" @machine.env.ui.info "Salt successfully configured!"
elsif configure and install elsif configure and install
@ -278,7 +278,7 @@ module VagrantPlugins
@machine.env.ui.info "Salt did not need installing or configuring." @machine.env.ui.info "Salt did not need installing or configuring."
end end
end end
def call_overstate def call_overstate
if @config.run_overstate if @config.run_overstate
if @config.install_master if @config.install_master