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

Also check for survey_enabled parameter

Browse Source
This commit is contained in:
beeankha
2020-01-15 14:38:04 -05:00
parent e8a95a1dac
commit db0d748302
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx_collection/plugins/modules/tower_job_launch.py
View File

@@ -126,14 +126,15 @@ def update_fields(module, p):
extra_vars = params.get('extra_vars') extra_vars = params.get('extra_vars')
try: try:
ask_extra_vars = tower_cli.get_resource('job_template').get(name=job_template)['ask_variables_on_launch'] ask_extra_vars = tower_cli.get_resource('job_template').get(name=job_template)['ask_variables_on_launch']
survey_enabled = tower_cli.get_resource('job_template').get(name=job_template)['survey_enabled']
except (exc.ConnectionError, exc.BadRequest, exc.AuthError) as excinfo: except (exc.ConnectionError, exc.BadRequest, exc.AuthError) as excinfo:
module.fail_json(msg='Failed to get ask_extra_vars parameter, job template not found: {0}'.format(excinfo), changed=False) module.fail_json(msg='Failed to get ask_extra_vars parameter, job template not found: {0}'.format(excinfo), changed=False)
if extra_vars and ask_extra_vars is not True: if extra_vars and (ask_extra_vars or survey_enabled):
module.fail_json(msg="extra_vars is set on launch but the Job Template does not have ask_extra_vars set to True.") params_update['extra_vars'] = [json.dumps(extra_vars)]
elif extra_vars: elif extra_vars:
params_update['extra_vars'] = [json.dumps(extra_vars)] module.fail_json(msg="extra_vars is set on launch but the Job Template does not have ask_extra_vars or survey_enabled set to True.")
params.update(params_update) params.update(params_update)
return params return params