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

Merge variables for hosts instead of updating in get_variables()

Browse source
This commit is contained in:
Serge van Ginderachter 2014-08-20 01:54:15 -05:00 committed by James Cammarata
parent 6975e5fd73
commit a1f09bd89f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class Host(object):
groups = self.get_groups()
for group in sorted(groups, key=lambda g: g.depth):
results = utils.combine_vars(results, group.get_variables())
results.update(self.vars)
results = utils.combine_vars(results, self.vars)
results['inventory_hostname'] = self.name
results['inventory_hostname_short'] = self.name.split('.')[0]
results['group_names'] = sorted([ g.name for g in groups if g.name != 'all'])