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 #45761 from gtmanfred/2017.7

Browse source 
generate a jid for cache_jobs on the minion
This commit is contained in:
Nicole Thomas 2018-01-31 13:01:52 -05:00 • committed by GitHub
commit 96e9232cc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/minion.py
View file

@ -1761,7 +1761,9 @@ class Minion(MinionBase):
load['out'] = oput
if self.opts['cache_jobs']:
# Local job cache has been enabled
salt.utils.minion.cache_jobs(self.opts, load['jid'], ret)
if ret['jid'] == 'req':
ret['jid'] = salt.utils.jid.gen_jid()
salt.utils.minion.cache_jobs(self.opts, ret['jid'], ret)
if not self.opts['pub_ret']:
return ''