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

add support for default returners using return

Browse source
This commit is contained in:
David Boucha 2016-12-12 19:29:24 -07:00
parent 09d9cff992
commit e7c6012655
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/minion.py
View file

@ -1449,6 +1449,20 @@ class Minion(MinionBase):
ret,
timeout=minion_instance._return_retry_timer()
)
# Add default returners from minion config
if isinstance(opts.get('return'), six.string_types):
if data['ret']:
data['ret'] = ','.join((data['ret'], opts['return']))
else:
data['ret'] = opts['return']
if isinstance(opts.get('return'), list):
if data['ret']:
for item in opts['return']:
data['ret'] = ','.join((data['ret'], item))
else:
data['ret'] = ','.join(opts['return'])
# TODO: make a list? Seems odd to split it this late :/
if data['ret'] and isinstance(data['ret'], six.string_types):
if 'ret_config' in data: