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

Merge pull request #26676 from rallytime/bp-26648

Browse source 
Back-port #26648 to 2015.5
This commit is contained in:
Colton Myers 2015-08-26 13:46:01 -06:00
commit 75675a6ba9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/saltutil.py
View file

@ -795,7 +795,7 @@ def cmd_iter(tgt,
yield ret
def runner(fun, **kwargs):
def runner(_fun, **kwargs):
'''
Execute a runner module (this function must be run on the master)
@ -822,10 +822,10 @@ def runner(fun, **kwargs):
else:
rclient = salt.runner.RunnerClient(__opts__)
return rclient.cmd(fun, [], kwarg=kwargs)
return rclient.cmd(_fun, kwarg=kwargs)
def wheel(fun, **kwargs):
def wheel(_fun, **kwargs):
'''
Execute a wheel module (this function must be run on the master)
@ -843,7 +843,7 @@ def wheel(fun, **kwargs):
salt '*' saltutil.wheel key.accept match=jerry
'''
wclient = salt.wheel.WheelClient(__opts__)
return wclient.cmd(fun, kwarg=kwargs)
return wclient.cmd(_fun, kwarg=kwargs)
# this is the only way I could figure out how to get the REAL file_roots