External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 02:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

correctly inherit extra_vars

Browse Source 
* inherit extra_vars from job_template
* overwrite with extra vars survey default vars
* overwrite with job extra_vars
This commit is contained in:
Chris Meyers
2015-08-07 15:59:06 -04:00
parent 7c315ebd33
commit fca62d1596
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,15 +284,32 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
return errors return errors
def _update_unified_job_kwargs(self, **kwargs): def _update_unified_job_kwargs(self, **kwargs):
# Overwrite job extra_vars with job template extra vars # Job Template extra_vars
extra_vars = self.extra_vars_dict extra_vars = self.extra_vars_dict
# Overwrite with job template survey default vars # Overwrite with job template extra vars with survey default vars
if self.survey_enabled and 'spec' in self.survey_spec: if self.survey_enabled and 'spec' in self.survey_spec:
for survey_element in self.survey_spec.get("spec", []): for survey_element in self.survey_spec.get("spec", []):
if survey_element['default']: if survey_element['default']:
extra_vars[survey_element['variable']] = survey_element['default'] extra_vars[survey_element['variable']] = survey_element['default']
# transform to dict
if 'extra_vars' in kwargs:
kwargs_extra_vars = kwargs['extra_vars']
if not isinstance(kwargs_extra_vars, dict):
try:
kwargs_extra_vars = json.loads(kwargs_extra_vars)
except Exception:
try:
yaml.safe_load(kwargs_extra_vars)
except:
kwargs_extra_vars = {}
else:
kwargs_extra_vars = {}
# Overwrite job template extra vars with explicit job extra vars
# and add on job extra vars
extra_vars.update(kwargs_extra_vars)
kwargs['extra_vars'] = json.dumps(extra_vars) kwargs['extra_vars'] = json.dumps(extra_vars)
return kwargs return kwargs