saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27838 from basepi/fix.runner.highstate.outputter.27831

Browse source 
[2015.5] Fix highstate outputter for jobs.lookup_jid
This commit is contained in:
Mike Place 2015-10-09 16:26:28 -06:00
commit 7508a1c474
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/client/mixins.py
View file

@ -446,11 +446,6 @@ class AsyncClientMixin(object):
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, 'outputter': 'highstate'}
ret = {'data': {minion.opts['id']: running}, 'outputter': 'highstate'}
return ret
# Aliases for orchestrate runner