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

WorkflowJob should set the workflow launch_type for spawned jobs

Browse Source
This commit is contained in:
Wayne Witzel III
2016-11-09 12:15:56 -05:00
parent 6f50a450af
commit 43450c2694
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/models/unified_jobs.py
View File

@@ -394,6 +394,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
('callback', _('Callback')), # Job was started via host callback. ('callback', _('Callback')), # Job was started via host callback.
('scheduled', _('Scheduled')), # Job was started from a schedule. ('scheduled', _('Scheduled')), # Job was started from a schedule.
('dependency', _('Dependency')), # Job was started as a dependency of another job. ('dependency', _('Dependency')), # Job was started as a dependency of another job.
('workflow', _('Workflow')), # Job was started from a workflow job.
] ]
PASSWORD_FIELDS = ('start_args',) PASSWORD_FIELDS = ('start_args',)

2
awx/main/models/workflow.py
View File

@@ -256,6 +256,8 @@ class WorkflowJobNode(WorkflowNodeBase):
extra_vars.update(functional_aa_dict) extra_vars.update(functional_aa_dict)
if extra_vars: if extra_vars:
data['extra_vars'] = extra_vars data['extra_vars'] = extra_vars
# ensure that unified jobs created by WorkflowJobs are marked
data['launch_type'] = 'workflow'
return data return data
class WorkflowJobOptions(BaseModel): class WorkflowJobOptions(BaseModel):