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 __env__ from saltmod orch states to to saltutil.{runner,wheel}

Browse source
This commit is contained in:
Erik Johnson 2016-07-29 01:52:45 -05:00
parent 7121618142
commit 951b52ab93
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/states/saltmod.py
View file

@ -577,7 +577,9 @@ def runner(name, **kwargs):
- name: manage.up
'''
ret = {'name': name, 'result': False, 'changes': {}, 'comment': ''}
out = __salt__['saltutil.runner'](name, **kwargs)
out = __salt__['saltutil.runner'](name,
__env__=__env__,
**kwargs)
ret['result'] = True
ret['comment'] = "Runner function '{0}' executed.".format(name)
@ -607,7 +609,9 @@ def wheel(name, **kwargs):
- match: frank
'''
ret = {'name': name, 'result': False, 'changes': {}, 'comment': ''}
out = __salt__['saltutil.wheel'](name, **kwargs)
out = __salt__['saltutil.wheel'](name,
__env__=__env__,
**kwargs)
ret['result'] = True
ret['comment'] = "Wheel function '{0}' executed.".format(name)