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

Fixes #17243
ansible · Nov 19, 2016 · 23b5764 · 23b5764
1 parent 3ce19f4
commit 23b5764
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ansible/inventory/host.py b/lib/ansible/inventory/host.py
@@ -138,6 +138,6 @@ def get_vars(self):
     def get_group_vars(self):
         results = {}
         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())
         return results
diff --git a/lib/ansible/vars/__init__.py b/lib/ansible/vars/__init__.py
@@ -252,7 +252,7 @@ def get_vars(self, loader, play=None, host=None, task=None, include_hostvars=Tru
             # 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, g.name)):
                 if group.name in self._group_vars_files and group.name != 'all':
                     for data in self._group_vars_files[group.name]:
                         data = preprocess_vars(data)