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

Merge pull request #524 from AlanCoding/yaml_devel

Browse Source 
Allow job_template launch to store YAML extra_vars
This commit is contained in:
Alan Rominger
2016-01-14 12:31:23 -05:00
parent 2a547865ba 319394442a
commit e63d7df163
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@
# Python
import hmac
import json
import yaml
import logging
# Django
@@ -305,7 +306,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
kwargs_extra_vars = json.loads(kwargs_extra_vars)
except Exception:
try:
yaml.safe_load(kwargs_extra_vars)
kwargs_extra_vars = yaml.safe_load(kwargs_extra_vars)
assert type(kwargs_extra_vars) is dict
except:
kwargs_extra_vars = {}
else: