zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 03:28:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

allow using SystemJobTemplates in workflows

Browse Source
This commit is contained in:
AlanCoding
2017-12-11 08:58:45 -05:00
parent 64ac1ee238
commit 4adfb9804e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tasks.py
+6 -2
View File
@@ -2196,7 +2196,11 @@ class RunSystemJob(BaseTask):
def build_args(self, system_job, **kwargs):
args = ['awx-manage', system_job.job_type]
try:
json_vars = json.loads(system_job.extra_vars)
# System Job extra_vars can be blank, must be JSON if not blank
if system_job.extra_vars == '':
json_vars = {}
else:
json_vars = json.loads(system_job.extra_vars)
if 'days' in json_vars and system_job.job_type != 'cleanup_facts':
args.extend(['--days', str(json_vars.get('days', 60))])
if 'dry_run' in json_vars and json_vars['dry_run'] and system_job.job_type != 'cleanup_facts':
@@ -2211,7 +2215,7 @@ class RunSystemJob(BaseTask):
if 'granularity' in json_vars:
args.extend(['--granularity', str(json_vars['granularity'])])
except Exception:
logger.exception("%s Failed to parse system job", instance.log_format)
logger.exception("%s Failed to parse system job", system_job.log_format)
return args
def get_stdout_handle(self, instance):