Fix var precedence bug introduced in ff9f5d7d

Fixes #14067
pull/15488/head
James Cammarata 9 years ago
parent 7b5d2d3bec
commit a0dea1ac35

@ -239,15 +239,15 @@ class VariableManager:
# files and then any vars from host_vars files which may apply to # files and then any vars from host_vars files which may apply to
# this host or the groups it belongs to # this host or the groups it belongs to
# we merge in vars from groups specified in the inventory (INI or script) # we merge in the special 'all' group_vars first, if they exist
all_vars = combine_vars(all_vars, host.get_group_vars())
# then we merge in the special 'all' group_vars first, if they exist
if 'all' in self._group_vars_files: if 'all' in self._group_vars_files:
data = preprocess_vars(self._group_vars_files['all']) data = preprocess_vars(self._group_vars_files['all'])
for item in data: for item in data:
all_vars = combine_vars(all_vars, item) all_vars = combine_vars(all_vars, item)
# we merge in vars from groups specified in the inventory (INI or script)
all_vars = combine_vars(all_vars, host.get_group_vars())
for group in sorted(host.get_groups(), key=lambda g: g.depth): for group in sorted(host.get_groups(), key=lambda g: g.depth):
if group.name in self._group_vars_files and group.name != 'all': if group.name in self._group_vars_files and group.name != 'all':
for data in self._group_vars_files[group.name]: for data in self._group_vars_files[group.name]:

Loading…
Cancel
Save