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

Merge pull request #7207 from msarahan/salt_masterless_rework 

Salt: move masterless config to apply to all platforms
This commit is contained in:
Seth Vargo 2016-06-06 19:28:29 -04:00
parent 0ec0420d6b 72e9f0fe10
commit d45dc0c9d9
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,27 +320,18 @@ module VagrantPlugins
end end
end end
def call_masterless
@machine.env.ui.info "Calling state.highstate in local mode... (this may take a while)"
cmd = "salt-call state.highstate --local#{get_loglevel}#{get_colorize}#{get_pillar}"
if @config.minion_id
cmd += " --id #{@config.minion_id}"
end
@machine.communicate.sudo(cmd) do |type, data|
if @config.verbose
@machine.env.ui.info(data)
end
end
end
def call_highstate def call_highstate
if @config.run_highstate
local=""
if @config.masterless if @config.masterless
call_masterless local=" --local"
elsif @config.run_highstate end
@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
unless @config.masterless?
@machine.communicate.sudo("salt '*' saltutil.sync_all") @machine.communicate.sudo("salt '*' saltutil.sync_all")
@machine.communicate.sudo("salt '*' state.highstate --verbose#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data| end
@machine.communicate.sudo("salt '*' state.highstate --verbose #{local}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
if @config.verbose if @config.verbose
@machine.env.ui.info(data.rstrip) @machine.env.ui.info(data.rstrip)
end end
@ -348,15 +339,19 @@ module VagrantPlugins
else else
if @machine.config.vm.communicator == :winrm if @machine.config.vm.communicator == :winrm
opts = { elevated: true } opts = { elevated: true }
unless @config.masterless?
@machine.communicate.execute("C:\\salt\\salt-call.bat saltutil.sync_all", opts) @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| end
@machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough #{local}#{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
if @config.verbose if @config.verbose
@machine.env.ui.info(data.rstrip) @machine.env.ui.info(data.rstrip)
end end
end end
else else
unless @config.masterless?
@machine.communicate.sudo("salt-call saltutil.sync_all") @machine.communicate.sudo("salt-call saltutil.sync_all")
@machine.communicate.sudo("salt-call state.highstate --retcode-passthrough #{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data| end
@machine.communicate.sudo("salt-call state.highstate --retcode-passthrough #{local}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
if @config.verbose if @config.verbose
@machine.env.ui.info(data.rstrip) @machine.env.ui.info(data.rstrip)
end end