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 #24388 from pengyao/sshclient-kwargs

Browse source 
fixes #24358
This commit is contained in:
Thomas S Hatch 2015-06-04 14:07:40 -06:00
commit 86ce9dbbdf
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/client/ssh/client.py
View file

@ -128,12 +128,20 @@ class SSHClient(object):
})
{'silver': {'fun_args': [], 'jid': '20141202152721523072', 'return': True, 'retcode': 0, 'success': True, 'fun': 'test.ping', 'id': 'silver'}}
'''
kwargs = copy.deepcopy(low)
for ignore in ['tgt', 'fun', 'arg', 'timeout', 'expr_form', 'kwarg']:
if ignore in kwargs:
del kwargs[ignore]
return self.cmd(low['tgt'],
low['fun'],
low.get('arg', []),
low.get('timeout'),
low.get('expr_form'),
low.get('kwarg'))
low.get('kwarg'),
**kwargs)
def cmd_async(self, low, timeout=None):
'''