Skip to content

Commit

Permalink
fix salt --summary to count not responding minions correctly (#34165)
Browse files Browse the repository at this point in the history
In case a minion is not responding a dict is returned instead of a string.
  • Loading branch information
mcalmer authored and Nicole Thomas committed Jun 21, 2016
1 parent e5949ea commit 6387d16
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions salt/cli/salt.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ def _print_returns_summary(self, ret):
not_connected_minions = []
for each_minion in ret:
minion_ret = ret[each_minion]
if isinstance(minion_ret, dict) and 'ret' in minion_ret:
minion_ret = ret[each_minion].get('ret')
if (
isinstance(minion_ret, string_types)
and minion_ret.startswith("Minion did not return")
Expand Down

0 comments on commit 6387d16

Please sign in to comment.