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

Merge pull request #3708 from AlanCoding/ancestors_PR

Browse Source 
Store vars from set_artifact tasks, pipe data through workflows
This commit is contained in:
Alan Rominger
2016-10-13 15:59:58 -04:00
committed by GitHub
parent 7022edc646 7472fbae8f
commit 1979d63c25
10 changed files with 180 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -893,7 +893,7 @@ class RunJob(BaseTask):
'tower_user_name': job.created_by.username,
})
if job.extra_vars_dict:
if kwargs.get('display', False) and job.job_template and job.job_template.survey_enabled:
if kwargs.get('display', False) and job.job_template:
extra_vars.update(json.loads(job.display_extra_vars()))
else:
extra_vars.update(job.extra_vars_dict)