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

Revert "keep ansible_local as top level var, always present"

Browse source 
This reverts commit 97cb2016d8.

It was causing issues downstream as facts seem to be merged back for
subsequent tasks. Will restore if I ever figure out how to avoid that.
This commit is contained in:
Brian Coca 2017-04-04 16:30:57 -04:00
parent a6ca849643
commit 00231c29ba
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/vars/__init__.py
View file

@ -289,17 +289,6 @@ class VariableManager:
all_vars = combine_vars(all_vars, host_facts)
# always return namespaced facts
all_vars = combine_vars(all_vars, {'ansible_facts': host_facts})
# push local to top namespace, ensure we always have, even if empty
if 'ansible_local' in all_vars['ansible_facts']:
all_vars.update({'ansible_local': all_vars['ansible_facts']['ansible_local']})
else:
all_vars.update({'ansible_local': {}})
# remove possible extra ansible_local from ansible_facts namespace
if 'ansible_local' in all_vars['ansible_facts']:
del all_vars['ansible_facts']['ansible_local']
except KeyError:
pass