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

Merge pull request #4472 from abele/fix/master/salt-retcode-passthrough 

Fix state.highstate run when using salt master
This commit is contained in:
Mitchell Hashimoto 2014-10-22 22:03:46 -07:00
parent 8e20caae8c fe16352267
commit d28a7806ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,7 @@ module VagrantPlugins
@machine.env.ui.info "Calling state.highstate... (this may take a while)" @machine.env.ui.info "Calling state.highstate... (this may take a while)"
if @config.install_master if @config.install_master
@machine.communicate.sudo("salt '*' saltutil.sync_all") @machine.communicate.sudo("salt '*' saltutil.sync_all")
@machine.communicate.sudo("salt '*' state.highstate --retcode-passthrough --verbose#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data| @machine.communicate.sudo("salt '*' state.highstate --verbose#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
if @config.verbose if @config.verbose
@machine.env.ui.info(data) @machine.env.ui.info(data)
end end