added inventory_hostname_short varible

This commit is contained in:
Derek Carter 2012-07-30 13:26:48 -04:00
parent 8f9e136ca0
commit 547395a2be
2 changed files with 1 additions and 3 deletions

View file

@ -163,9 +163,6 @@ class Inventory(object):
)
(out, err) = cmd.communicate()
results = utils.parse_json(out)
results['inventory_hostname'] = hostname
groups = [ g.name for g in host.get_groups() if g.name != 'all' ]
results['group_names'] = sorted(groups)
return results
host = self.get_host(hostname)

View file

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