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

Merge pull request #7865 from DavidWittman/7454-fix-salt-minion-id-config 

Fix minion_id config for salt provisioner
This commit is contained in:
Chris Roberts 2017-06-15 16:01:33 -07:00 committed by GitHub
parent 3eca98acd8 00c7b1e005
commit d260fe7d38
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,6 +184,20 @@ module VagrantPlugins
end end
end end
# Get command-line options for masterless provisioning
def get_masterless
options = ""
if @config.masterless
options = " --local"
if @config.minion_id
options += " --id #{@config.minion_id}"
end
end
return options
end
# Copy master and minion configs to VM # Copy master and minion configs to VM
def upload_configs def upload_configs
if @config.minion_config if @config.minion_config
@ -335,16 +349,12 @@ module VagrantPlugins
def call_highstate def call_highstate
if @config.run_highstate if @config.run_highstate
local=""
if @config.masterless
local=" --local"
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? unless @config.masterless?
@machine.communicate.sudo("salt '*' saltutil.sync_all") @machine.communicate.sudo("salt '*' saltutil.sync_all")
end end
@machine.communicate.sudo("salt '*' state.highstate --verbose #{local}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data| @machine.communicate.sudo("salt '*' state.highstate --verbose#{get_masterless}#{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
@ -355,7 +365,7 @@ module VagrantPlugins
unless @config.masterless? 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)
end end
@machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough #{local}#{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data| @machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough#{get_masterless}#{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
@ -364,7 +374,7 @@ module VagrantPlugins
unless @config.masterless? unless @config.masterless?
@machine.communicate.sudo("salt-call saltutil.sync_all") @machine.communicate.sudo("salt-call saltutil.sync_all")
end end
@machine.communicate.sudo("salt-call state.highstate --retcode-passthrough #{local}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data| @machine.communicate.sudo("salt-call state.highstate --retcode-passthrough#{get_masterless}#{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