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

Properly sort groups by name as well as depth when getting vars

Browse source 
Fixes #17243
This commit is contained in:
James Cammarata 2016-11-18 22:56:37 -06:00
parent 3ce19f4c58
commit 23b5764b57
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/inventory/host.py
View file

@ -138,6 +138,6 @@ class Host:
def get_group_vars(self): def get_group_vars(self):
results = {} results = {}
groups = self.get_groups() groups = self.get_groups()
for group in sorted(groups, key=lambda g: g.depth): for group in sorted(groups, key=lambda g: (g.depth, g.name)):
results = combine_vars(results, group.get_vars()) results = combine_vars(results, group.get_vars())
return results return results

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

@ -252,7 +252,7 @@ class VariableManager:
# we merge in vars from groups specified in the inventory (INI or script) # we merge in vars from groups specified in the inventory (INI or script)
all_vars = combine_vars(all_vars, host.get_group_vars()) 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, g.name)):
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]:
data = preprocess_vars(data) data = preprocess_vars(data)