External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-03 20:38:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2019-05-03 07:58:25 -04:00
parent 17d2efde95 4be05f1bf6
commit 8d75fc5f56
33 changed files with 198 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -1042,7 +1042,7 @@ class BaseTask(object):
AWX only saves the parent_uuid if the event is for a Job.
'''
if event_data.get(self.event_data_key, None):
if event_data[self.event_data_key] != 'job_id':
if self.event_data_key != 'job_id':
event_data.pop('parent_uuid', None)
should_write_event = False
event_data.setdefault(self.event_data_key, self.instance.id)