Skip to content

Commit

Permalink
remove misleading group vars as they are flat (ansible#32276)
Browse files Browse the repository at this point in the history
* remove misleading group vars as they are flat

* fixed vars display
  • Loading branch information
bcoca committed Oct 30, 2017
1 parent e05dacf commit 75a6f9d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/ansible/cli/inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def _show_vars(self, dump, depth):
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):
Expand All @@ -231,7 +231,7 @@ def _graph_group(self, group, depth=0):
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))

Expand All @@ -252,7 +252,6 @@ def format_group(group):
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)
Expand Down Expand Up @@ -281,7 +280,6 @@ def format_group(group):

# initialize group + vars
results[group.name] = {}
results[group.name]['vars'] = group.get_vars()

# subgroups
results[group.name]['children'] = {}
Expand Down

0 comments on commit 75a6f9d

Please sign in to comment.