valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27907 from erchn/fix_cli_eauth

Browse Source 
pass along kwargs data so gather_job_info so find_job will use eauth
This commit is contained in:
Mike Place 2015-10-14 08:23:38 -06:00
commit 35b5fb7e5f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/client/__init__.py
View File

@ -195,7 +195,7 @@ class LocalClient(object):
# Looks like the timeout is invalid, use config # Looks like the timeout is invalid, use config
return self.opts['timeout'] return self.opts['timeout']
def gather_job_info(self, jid, tgt, tgt_type): def gather_job_info(self, jid, tgt, tgt_type, **kwargs):
''' '''
Return the information about a given job Return the information about a given job
''' '''
@ -207,6 +207,7 @@ class LocalClient(object):
arg=[jid], arg=[jid],
expr_form=tgt_type, expr_form=tgt_type,
timeout=timeout, timeout=timeout,
**kwargs
) )
if 'jid' in pub_data: if 'jid' in pub_data:
@ -934,7 +935,7 @@ class LocalClient(object):
# re-do the ping # re-do the ping
if time.time() > timeout_at and minions_running: if time.time() > timeout_at and minions_running:
# since this is a new ping, no one has responded yet # since this is a new ping, no one has responded yet
jinfo = self.gather_job_info(jid, tgt, tgt_type) jinfo = self.gather_job_info(jid, tgt, tgt_type, **kwargs)
minions_running = False minions_running = False
# if we weren't assigned any jid that means the master thinks # if we weren't assigned any jid that means the master thinks
# we have nothing to send # we have nothing to send
@ -1252,7 +1253,8 @@ class LocalClient(object):
timeout=timeout, timeout=timeout,
tgt=tgt, tgt=tgt,
tgt_type=tgt_type, tgt_type=tgt_type,
expect_minions=(verbose or show_timeout) expect_minions=(verbose or show_timeout),
**kwargs
): ):
return_count = return_count + 1 return_count = return_count + 1
if progress: if progress: