ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix logic for changed/failed_when + retry/until loops

Browse source 
Fixes #11809
This commit is contained in:
James Cammarata 2015-09-15 13:37:07 -04:00
parent 8e664ad226
commit 60c139e482
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/ansible/executor/task_executor.py
View file

@ -354,20 +354,29 @@ class TaskExecutor:
# create a conditional object to evaluate task conditions # create a conditional object to evaluate task conditions
cond = Conditional(loader=self._loader) cond = Conditional(loader=self._loader)
def _evaluate_changed_when_result(result):
if self._task.changed_when is not None:
cond.when = [ self._task.changed_when ]
result['changed'] = cond.evaluate_conditional(templar, vars_copy)
def _evaluate_failed_when_result(result):
if self._task.failed_when is not None:
cond.when = [ self._task.failed_when ]
failed_when_result = cond.evaluate_conditional(templar, vars_copy)
result['failed_when_result'] = result['failed'] = failed_when_result
return failed_when_result
return False
# FIXME: make sure until is mutually exclusive with changed_when/failed_when # FIXME: make sure until is mutually exclusive with changed_when/failed_when
if self._task.until: if self._task.until:
cond.when = self._task.until cond.when = self._task.until
if cond.evaluate_conditional(templar, vars_copy): if cond.evaluate_conditional(templar, vars_copy):
_evaluate_changed_when_result(result)
_evaluate_failed_when_result(result)
break break
elif (self._task.changed_when or self._task.failed_when) and 'skipped' not in result: elif (self._task.changed_when is not None or self._task.failed_when is not None) and 'skipped' not in result:
if self._task.changed_when: _evaluate_changed_when_result(result)
cond.when = [ self._task.changed_when ] if _evaluate_failed_when_result(result):
result['changed'] = cond.evaluate_conditional(templar, vars_copy)
if self._task.failed_when:
cond.when = [ self._task.failed_when ]
failed_when_result = cond.evaluate_conditional(templar, vars_copy)
result['failed_when_result'] = result['failed'] = failed_when_result
if failed_when_result:
break break
elif 'failed' not in result: elif 'failed' not in result:
if result.get('rc', 0) != 0: if result.get('rc', 0) != 0:
@ -378,6 +387,9 @@ class TaskExecutor:
if attempt < retries - 1: if attempt < retries - 1:
time.sleep(delay) time.sleep(delay)
else:
_evaluate_changed_when_result(result)
_evaluate_failed_when_result(result)
# do the final update of the local variables here, for both registered # do the final update of the local variables here, for both registered
# values and any facts which may have been created # values and any facts which may have been created