From 1a6ae6e107788c83a6723920df2b1899a687bdaf Mon Sep 17 00:00:00 2001 From: chris meyers Date: Wed, 20 Mar 2019 11:05:01 -0400 Subject: [PATCH] allow for runner setting parent_uuid * Previously, parent_uuid was expected only on events generated for a Job run. Now, there maybe a parent_uuid for any job type. AWX does not support parenting events for any job type other than Job. --- awx/main/tasks.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 76e1d1ba52..44f96e0b98 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -985,6 +985,14 @@ class BaseTask(object): ''' Ansible runner callback for events ''' + + ''' + Ansible runner puts a parent_uuid on each event, no matter what the type. + 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': + event_data.pop('parent_uuid', None) should_write_event = False dispatcher = CallbackQueueDispatcher() event_data.setdefault(self.event_data_key, self.instance.id)