zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-26 09:51:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor job template callback post to mimic the behavior of normal jt launch.

Browse Source
This commit is contained in:
Aaron Tan
2017-03-17 12:51:19 -04:00
parent 90bcc3d6ab
commit 6083e9482e
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,6 +300,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
Return whether job template can be used to start a new job without
requiring any user input.
'''
# It is worthwhile to find out if this function is now only used by
# provisioning callback.
variables_needed = False
if callback_extra_vars:
extra_vars_dict = parse_yaml_or_json(callback_extra_vars)
@@ -310,10 +312,13 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
elif self.variables_needed_to_start:
variables_needed = True
prompting_needed = False
for key, value in self._ask_for_vars_dict().iteritems():
if value and not (key == 'extra_vars' and
callback_extra_vars is not None):
prompting_needed = True
# The behavior of provisioning callback should mimic
# that of job template launch, so prompting_needed should
# not block a provisioning callback from creating/launching jobs.
if callback_extra_vars is None:
for value in self._ask_for_vars_dict().values():
if value:
prompting_needed = True
return (not prompting_needed and
not self.passwords_needed_to_start and
not variables_needed)