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

add all group vars back to implicit localhost

Browse source 
fixes #31857
reverts #31425
This commit is contained in:
Brian Coca 2017-10-18 10:02:03 -04:00 committed by Toshio Kuratomi
parent bd0e1b8743
commit 7fe6a8dab7
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/inventory/data.py
View file

@ -79,6 +79,9 @@ class InventoryData(object):
else:
new_host = Host(pattern)
# use 'all' vars but not part of all group
new_host.vars = self.groups['all'].get_vars()
new_host.address = "127.0.0.1"
new_host.implicit = True

15
lib/ansible/vars/manager.py
View file

@ -334,15 +334,14 @@ class VariableManager:
data[group] = combine_vars(data[group], _plugins_play(group))
return data
# Merge groups as per precedence config, if not implicit localhost
# Merge groups as per precedence config
# only allow to call the functions we want exposed
if not host.implicit:
for entry in C.VARIABLE_PRECEDENCE:
if entry in self._ALLOWED:
display.debug('Calling %s to load vars for %s' % (entry, host.name))
all_vars = combine_vars(all_vars, locals()[entry]())
else:
display.warning('Ignoring unknown variable precedence entry: %s' % (entry))
for entry in C.VARIABLE_PRECEDENCE:
if entry in self._ALLOWED:
display.debug('Calling %s to load vars for %s' % (entry, host.name))
all_vars = combine_vars(all_vars, locals()[entry]())
else:
display.warning('Ignoring unknown variable precedence entry: %s' % (entry))
# host vars, from inventory, inventory adjacent and play adjacent via plugins
all_vars = combine_vars(all_vars, host.get_vars())