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

Pass full_return to saltutil.runner

Browse source 
This preserves the traditional return data structure for normal usage
while allowing for the full return in orchestration.
This commit is contained in:
Erik Johnson 2016-12-01 12:18:05 -06:00
parent 0a041277ea
commit 9bf13d55b4
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/saltutil.py
View file

@ -1155,6 +1155,7 @@ def runner(name, **kwargs):
'''
jid = kwargs.pop('__orchestration_jid__', None)
saltenv = kwargs.pop('__env__', 'base')
full_return = kwargs.pop('full_return', False)
kwargs = salt.utils.clean_kwargs(**kwargs)
if 'master_job_cache' not in __opts__:
@ -1178,7 +1179,10 @@ def runner(name, **kwargs):
prefix='run'
)
return rclient.cmd(name, kwarg=kwargs, print_event=False, full_return=True)
return rclient.cmd(name,
kwarg=kwargs,
print_event=False,
full_return=full_return)
def wheel(name, *args, **kwargs):

1
salt/states/saltmod.py
View file

@ -649,6 +649,7 @@ def runner(name, **kwargs):
out = __salt__['saltutil.runner'](name,
__orchestration_jid__=jid,
__env__=__env__,
full_return=True,
**kwargs)
ret['result'] = True