Merge variables for hosts instead of updating in get_variables()

pull/8690/head
Serge van Ginderachter 10 years ago committed by James Cammarata
parent 6975e5fd73
commit a1f09bd89f

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

Loading…
Cancel
Save