cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Avoid 2nd processing of facts for actions

Browse source 
include_vars and set_fact are already updating hostvars in strategy
no need to 're add again' with lower priority the same data.

fixes #37535, mostly by avoiding reprocessing and 'cleaning'
This commit is contained in:
Brian Coca 2018-03-16 15:34:30 -04:00 committed by Brian Coca
parent 0633f73faf
commit 3bec76fc85
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -593,7 +593,7 @@ class TaskExecutor:
failed_when_result = False
return failed_when_result
if 'ansible_facts' in 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']))
@ -651,7 +651,7 @@ class TaskExecutor:
if self._task.register:
variables[self._task.register] = wrap_var(result)
if 'ansible_facts' in 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']))