External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #323 from chrismeyersfsu/fix-job_survey_vars

Browse Source 
on job template launch inherit variables in the following hierarchy
This commit is contained in:
Chris Meyers 2015-07-31 15:37:17 -04:00
commit 3bc2a38dfe
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/models/jobs.py
View File

@ -282,6 +282,19 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
survey_element['variable'],
survey_element['choices']))
return errors
def _update_unified_job_kwargs(self, **kwargs):
# Overwrite job extra_vars with job template extra vars
extra_vars = self.extra_vars_dict
# Overwrite with job template survey default vars
if self.survey_enabled and 'spec' in self.survey_spec:
for survey_element in self.survey_spec.get("spec", []):
if survey_element['default']:
extra_vars[survey_element['variable']] = survey_element['default']
kwargs['extra_vars'] = json.dumps(extra_vars)
return kwargs
@property
def cache_timeout_blocked(self):