shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #363 from chrismeyersfsu/fix-unicode

Browse Source 
allow unicode in stdout.
This commit is contained in:
Chris Meyers 2015-08-10 11:26:20 -04:00
commit 5f4f7e0aaf
2 changed files with 20 additions and 3 deletions
Show Stats 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
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
# 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:
for survey_element in self.survey_spec.get("spec", []):
if 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)
return kwargs

2
requirements/requirements.txt
View File

@ -1,5 +1,5 @@
amqp==1.4.5
ansiconv==1.0.0
git+https://github.com/chrismeyersfsu/ansiconv.git@tower_1.0.0#egg=ansiconv-tower_1.0.0
anyjson==0.3.3
apache-libcloud==0.15.1
argparse==1.2.1