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

Merge pull request #5999 from PatOShea/patch-4 

Correct salt-minion and call ext on windows guest
This commit is contained in:
Mitchell Hashimoto 2015-11-18 11:39:09 -08:00
parent 6db0e0ddfb d34bc38bf3
commit 6639d56c9c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,8 @@ module VagrantPlugins
desired_binaries = []
if !@config.no_minion
if @machine.config.vm.communicator == :winrm
desired_binaries.push('C:\\salt\\salt-minion.exe')
desired_binaries.push('C:\\salt\\salt-call.exe')
desired_binaries.push('C:\\salt\\salt-minion.bat')
desired_binaries.push('C:\\salt\\salt-call.bat')
else
desired_binaries.push('salt-minion')
desired_binaries.push('salt-call')
@ -361,8 +361,8 @@ module VagrantPlugins
else
if @machine.config.vm.communicator == :winrm
opts = { elevated: true }
@machine.communicate.execute("C:\\salt\\salt-call.exe saltutil.sync_all", opts)
@machine.communicate.execute("C:\\salt\\salt-call.exe state.highstate --retcode-passthrough #{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
@machine.communicate.execute("C:\\salt\\salt-call.bat saltutil.sync_all", opts)
@machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough #{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
if @config.verbose
@machine.env.ui.info(data.rstrip)
end