Merge pull request #11370 from makinacorpus/hfix5

state.saltmod: kwarg support
This commit is contained in:
Thomas S Hatch 2014-03-21 10:29:04 -06:00
commit 4681b30224

View File

@ -232,6 +232,7 @@ def function(
expr_form=None,
ret='',
arg=None,
kwarg=None,
timeout=None):
'''
Execute a single module function on a remote minion via salt or salt-ssh
@ -248,13 +249,18 @@ def function(
arg
The list of arguments to pass into the function
kwargs
The list of keyword arguments to pass into the function
ret
Optionally set a single or a list of returners to use
ssh
Set to `True` to use the ssh client instaed of the standard salt client
'''
cmd_kw = {'arg': arg or [], 'ret': ret, 'timeout': timeout}
if not kwarg:
kwarg = {}
cmd_kw = {'arg': arg or [], 'kwarg': kwarg, 'ret': ret, 'timeout': timeout}
ret = {'name': name,
'changes': {},