add all group vars back to implicit localhost

fixes #31857
reverts #31425
pull/4420/head
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

View File

@ -79,6 +79,9 @@ class InventoryData(object):
else: else:
new_host = Host(pattern) 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.address = "127.0.0.1"
new_host.implicit = True new_host.implicit = True

View File

@ -334,9 +334,8 @@ class VariableManager:
data[group] = combine_vars(data[group], _plugins_play(group)) data[group] = combine_vars(data[group], _plugins_play(group))
return data 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 # only allow to call the functions we want exposed
if not host.implicit:
for entry in C.VARIABLE_PRECEDENCE: for entry in C.VARIABLE_PRECEDENCE:
if entry in self._ALLOWED: if entry in self._ALLOWED:
display.debug('Calling %s to load vars for %s' % (entry, host.name)) display.debug('Calling %s to load vars for %s' % (entry, host.name))