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

For orchestration jobs, include the jid in the pub data

Browse Source
This commit is contained in:
Erik Johnson 2016-07-28 23:07:07 -05:00
parent 4d17872792
commit dd7baa6ed2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/runner.py
View File

@ -182,9 +182,17 @@ class Runner(RunnerClient):
user = salt.utils.get_specific_user()
# Allocate a jid
async_pub = self._gen_async_pub()
if low['fun'] == 'state.orchestrate':
low['kwarg']['__pub_orchestration_jid'] = async_pub['jid']
# Run the runner!
if self.opts.get('async', False):
async_pub = self.async(self.opts['fun'], low, user=user)
async_pub = self.async(self.opts['fun'],
low,
user=user,
pub=async_pub)
# by default: info will be not enougth to be printed out !
log.warning('Running in async mode. Results of this execution may '
'be collected by attaching to the master event bus or '
@ -192,8 +200,6 @@ class Runner(RunnerClient):
'This execution is running under tag {tag}'.format(**async_pub))
return async_pub['jid'] # return the jid
# otherwise run it in the main process
async_pub = self._gen_async_pub()
ret = self._proc_function(self.opts['fun'],
low,
user,