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

Ensure batch uses passed eauth token or credentials

Browse source
This commit is contained in:
Christian McHugh 2017-04-09 09:23:06 +01:00 • committed by rallytime
parent 6df76f6687
commit 5fb8190d44
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/client/__init__.py
View file

@ -516,10 +516,14 @@ class LocalClient(object):
if 'gather_job_timeout' in kwargs:
opts['gather_job_timeout'] = kwargs['gather_job_timeout']
eauth=kwargs.get('eauth', {})
if 'token' in kwargs:
eauth['token'] = kwargs['token']
for key, val in six.iteritems(self.opts):
if key not in opts:
opts[key] = val
batch = salt.cli.batch.Batch(opts, quiet=True)
batch = salt.cli.batch.Batch(opts, eauth=eauth, quiet=True)
for ret in batch.run():
yield ret