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

Merge pull request #6474 from aneeshusa/enable-salt-options-for-masterless 

Enable log_level and colorize for salt masterless
This commit is contained in:
Mitchell Hashimoto 2015-11-18 15:11:54 -08:00
parent d657804f18 84408c1682
commit fbdb6c0d19
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,11 +329,10 @@ module VagrantPlugins
def call_masterless def call_masterless
@machine.env.ui.info "Calling state.highstate in local mode... (this may take a while)" @machine.env.ui.info "Calling state.highstate in local mode... (this may take a while)"
cmd = "salt-call state.highstate --local" cmd = "salt-call state.highstate --local#{get_loglevel}#{get_colorize}#{get_pillar}"
if @config.minion_id if @config.minion_id
cmd += " --id #{@config.minion_id}" cmd += " --id #{@config.minion_id}"
end end
cmd += " -l debug#{get_pillar}"
@machine.communicate.sudo(cmd) do |type, data| @machine.communicate.sudo(cmd) do |type, data|
if @config.verbose if @config.verbose
@machine.env.ui.info(data) @machine.env.ui.info(data)