Catch loop eval errors and only raise them again if the task is not skipped
This should help on issues like #16222.
(cherry picked from commit 57cf5e431c
)
This commit is contained in:
parent
eea3051a12
commit
c3fbe526ca
1 changed files with 13 additions and 1 deletions
|
@ -71,6 +71,7 @@ class TaskExecutor:
|
|||
self._shared_loader_obj = shared_loader_obj
|
||||
self._connection = None
|
||||
self._rslt_q = rslt_q
|
||||
self._loop_eval_error = None
|
||||
|
||||
def run(self):
|
||||
'''
|
||||
|
@ -90,7 +91,13 @@ class TaskExecutor:
|
|||
roledir = self._task._role._role_path
|
||||
self._job_vars['roledir'] = roledir
|
||||
|
||||
items = self._get_loop_items()
|
||||
try:
|
||||
items = self._get_loop_items()
|
||||
except AnsibleUndefinedVariable as e:
|
||||
# save the error raised here for use later
|
||||
items = None
|
||||
self._loop_eval_error = e
|
||||
|
||||
if items is not None:
|
||||
if len(items) > 0:
|
||||
item_results = self._run_loop(items)
|
||||
|
@ -377,6 +384,11 @@ class TaskExecutor:
|
|||
if not self._task.evaluate_conditional(templar, variables):
|
||||
display.debug("when evaluation failed, skipping this task")
|
||||
return dict(changed=False, skipped=True, skip_reason='Conditional check failed', _ansible_no_log=self._play_context.no_log)
|
||||
# since we're not skipping, if there was a loop evaluation error
|
||||
# raised earlier we need to raise it now to halt the execution of
|
||||
# this task
|
||||
if self._loop_eval_error is not None:
|
||||
raise self._loop_eval_error
|
||||
except AnsibleError:
|
||||
# skip conditional exception in the case of includes as the vars needed might not be avaiable except in the included tasks or due to tags
|
||||
if self._task.action != 'include':
|
||||
|
|
Loading…
Reference in a new issue