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

Fix minion_id config for salt provisioner 

Changes introduced in #7207 removed the logic to handle the
`minion_id` configuration. This commit addresses that regression
by including the `--id #{@config.minion_id}` flag everywhere that
`--local` is used (as it had done before).

I'm not totally in love with the `get_masterless` abstraction here,
so if someone has a better suggestion I'll happily change it.

Fixes #7454
This commit is contained in:
David Wittman 2016-10-04 16:10:51 -05:00
parent c6423e8d9d
commit 00c7b1e005
No known key found for this signature in database
GPG Key ID: BDEF0C8AF33DC2F4
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

@ -171,6 +171,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
@ -322,16 +336,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
@ -342,7 +352,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
@ -351,7 +361,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