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

Allow highstate outputter to show all results

Browse source 
This regressed here: 82a70e015f

The above incorrect assumed that all data flowing into the highstate outputter is expected to be a dictionary. However, looking at _format_host() shows that it does expect to receive multiple types and does handle them accordingly.

I believe that the issue reported in #33915 may be fixed by #35559 instead. This should allow the highstate outputter to display all results instead of stopping after the first one. I would like @terminalmage and @mattglv and possibly @Ch3ll to please confirm this before we get this in.

Resolves #35423
This commit is contained in:
Mike Place 2016-09-08 12:04:32 +09:00
parent 70da628018
commit 1e8431f2b8
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/output/highstate.py
View file

@ -133,9 +133,6 @@ def output(data):
ret = [
_format_host(host, hostdata)[0]
for host, hostdata in six.iteritems(data)
# Highstate return data must be a dict, if this is not the case
# then this value is likely a retcode.
if isinstance(hostdata, dict)
]
if ret:
return "\n".join(ret)