valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25521 from cachedout/orch_outputter

Browse Source 
Fix outputter for state.orch
This commit is contained in:
Mike Place 2015-07-20 13:30:13 -06:00
commit 9e19142c35
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/client/mixins.py
View File

@ -438,7 +438,16 @@ class AsyncClientMixin(object):
if suffix in ('new',):
return
outputter = self.opts.get('output', event.get('outputter', None))
try:
outputter = self.opts.get('output', event.get('outputter', None) or event.get('return').get('outputter'))
except AttributeError:
outputter = None
try:
if event.get('return').get('outputter'):
event['return'].pop('outputter')
except AttributeError:
pass
# if this is a ret, we have our own set of rules
if suffix == 'ret':
# Check if ouputter was passed in the return data. If this is the case,

2
salt/runners/state.py
View File

@ -112,7 +112,7 @@ def orchestrate(mods, saltenv='base', test=None, exclude=None, pillar=None):
test,
exclude,
pillar=pillar)
ret = {minion.opts['id']: running}
ret = {minion.opts['id']: running, 'outputter': 'highstate'}
return ret
# Aliases for orchestrate runner