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

fix sorting of groups for host vars

Browse source 
Fixes #13371
This commit is contained in:
James Cammarata 2015-12-03 14:22:27 -05:00
parent 0d0ed35ba4
commit 013ace9ab2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,7 +234,7 @@ class VariableManager:
for item in data: for item in data:
all_vars = combine_vars(all_vars, item) all_vars = combine_vars(all_vars, item)
for group in host.get_groups(): 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]:
data = preprocess_vars(data) data = preprocess_vars(data)
@ -404,7 +404,7 @@ class VariableManager:
items = [] items = []
if task.loop is not None: if task.loop is not None:
if task.loop in lookup_loader: if task.loop in lookup_loader:
#TODO: remove convert_bare true and deprecate this in with_ #TODO: remove convert_bare true and deprecate this in with_
try: try:
loop_terms = listify_lookup_plugin_terms(terms=task.loop_args, templar=templar, loader=loader, fail_on_undefined=True, convert_bare=True) loop_terms = listify_lookup_plugin_terms(terms=task.loop_args, templar=templar, loader=loader, fail_on_undefined=True, convert_bare=True)
except AnsibleUndefinedVariable as e: except AnsibleUndefinedVariable as e:
@ -604,4 +604,3 @@ class VariableManager:
if host_name not in self._vars_cache: if host_name not in self._vars_cache:
self._vars_cache[host_name] = dict() self._vars_cache[host_name] = dict()
self._vars_cache[host_name][varname] = value self._vars_cache[host_name][varname] = value