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

allow incremental update for vars in loop for set_fact/include_vars (#38302)

Browse source 
* fix set_fact/include_vars looping

* tests for all behaviours affected

* add tests with injection off/on
This commit is contained in:
Brian Coca 2018-04-05 19:57:34 -04:00 • committed by Will Thames
parent 1b9879ccbf
commit 2afb1090b1
4 changed files with 50 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -605,10 +605,13 @@ class TaskExecutor:
failed_when_result = False
return failed_when_result
if 'ansible_facts' in result and self._task.action not in ('set_fact', 'include_vars'):
vars_copy.update(namespace_facts(result['ansible_facts']))
if C.INJECT_FACTS_AS_VARS:
vars_copy.update(clean_facts(result['ansible_facts']))
if 'ansible_facts' in result:
if self._task.action in ('set_fact', 'include_vars'):
vars_copy.update(result['ansible_facts'])
else:
vars_copy.update(namespace_facts(result['ansible_facts']))
if C.INJECT_FACTS_AS_VARS:
vars_copy.update(clean_facts(result['ansible_facts']))
# set the failed property if it was missing.
if 'failed' not in result:
@ -663,10 +666,13 @@ class TaskExecutor:
if self._task.register:
variables[self._task.register] = wrap_var(result)
if 'ansible_facts' in result and self._task.action not in ('set_fact', 'include_vars'):
variables.update(namespace_facts(result['ansible_facts']))
if C.INJECT_FACTS_AS_VARS:
variables.update(clean_facts(result['ansible_facts']))
if 'ansible_facts' in result:
if self._task.action in ('set_fact', 'include_vars'):
variables.update(result['ansible_facts'])
else:
variables.update(namespace_facts(result['ansible_facts']))
if C.INJECT_FACTS_AS_VARS:
variables.update(clean_facts(result['ansible_facts']))
# save the notification target in the result, if it was specified, as
# this task may be running in a loop in which case the notification