From 43450c26943b5fd9a8a961db80385b872cc507dc Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 9 Nov 2016 12:15:56 -0500 Subject: [PATCH] WorkflowJob should set the workflow launch_type for spawned jobs --- awx/main/models/unified_jobs.py | 1 + awx/main/models/workflow.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 2c46157007..520c8fe4de 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -394,6 +394,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique ('callback', _('Callback')), # Job was started via host callback. ('scheduled', _('Scheduled')), # Job was started from a schedule. ('dependency', _('Dependency')), # Job was started as a dependency of another job. + ('workflow', _('Workflow')), # Job was started from a workflow job. ] PASSWORD_FIELDS = ('start_args',) diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 6d99be326f..426e2ac6b5 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -256,6 +256,8 @@ class WorkflowJobNode(WorkflowNodeBase): extra_vars.update(functional_aa_dict) if extra_vars: data['extra_vars'] = extra_vars + # ensure that unified jobs created by WorkflowJobs are marked + data['launch_type'] = 'workflow' return data class WorkflowJobOptions(BaseModel):