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

Update minion to return extra key data to master

Browse Source
This commit is contained in:
Thomas S Hatch 2013-03-26 14:03:53 -06:00
parent 2156fbea29
commit 68b5aacf58
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/minion.py
View File

@ -548,10 +548,12 @@ class Minion(object):
continue continue
load['return'][key] = value load['return'][key] = value
else: else:
load = {'return': ret['return'], load = {'cmd': ret_cmd,
'cmd': ret_cmd,
'jid': ret['jid'],
'id': self.opts['id']} 'id': self.opts['id']}
for key, value in ret.items():
if key == 'fun':
continue
load[key] = value
try: try:
if hasattr(self.functions[ret['fun']], '__outputter__'): if hasattr(self.functions[ret['fun']], '__outputter__'):
oput = self.functions[ret['fun']].__outputter__ oput = self.functions[ret['fun']].__outputter__