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

remove misleading group vars as they are flat (#32276)

Browse source 
* remove misleading group vars as they are flat

* fixed vars display
This commit is contained in:
Brian Coca 2017-10-30 12:59:43 -04:00 committed by GitHub
parent e05dacfe91
commit 75a6f9dbc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/cli/inventory.py
View file

@ -213,7 +213,7 @@ class InventoryCLI(CLI):
self._remove_internal(dump)
if self.options.show_vars:
for (name, val) in sorted(dump.items()):
result.append(self._graph_name('{%s = %s}' % (name, val), depth + 1))
result.append(self._graph_name('{%s = %s}' % (name, val), depth))
return result
def _graph_name(self, name, depth=0):
@ -231,7 +231,7 @@ class InventoryCLI(CLI):
if group.name != 'all':
for host in sorted(group.hosts, key=attrgetter('name')):
result.append(self._graph_name(host.name, depth))
result.extend(self._show_vars(host.get_vars(), depth))
result.extend(self._show_vars(host.get_vars(), depth + 1))
result.extend(self._show_vars(group.get_vars(), depth))
@ -252,7 +252,6 @@ class InventoryCLI(CLI):
results[group.name] = {}
if group.name != 'all':
results[group.name]['hosts'] = [h.name for h in sorted(group.hosts, key=attrgetter('name'))]
results[group.name]['vars'] = group.get_vars()
results[group.name]['children'] = []
for subgroup in sorted(group.child_groups, key=attrgetter('name')):
results[group.name]['children'].append(subgroup.name)
@ -281,7 +280,6 @@ class InventoryCLI(CLI):
# initialize group + vars
results[group.name] = {}
results[group.name]['vars'] = group.get_vars()
# subgroups
results[group.name]['children'] = {}