a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #724 from goozbach/inventory_short 

added inventory_hostname_short varible
pull/4420/head
Michael DeHaan 2012-07-30 10:37:15 -07:00
parent 8f9e136ca0 547395a2be
commit 3ad07d5965
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/inventory/__init__.py
View File

@ -163,9 +163,6 @@ class Inventory(object):
) )
(out, err) = cmd.communicate() (out, err) = cmd.communicate()
results = utils.parse_json(out) 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 return results
host = self.get_host(hostname) host = self.get_host(hostname)

1
lib/ansible/inventory/host.py
View File

@ -59,6 +59,7 @@ class Host(object):
results.update(group.get_variables()) results.update(group.get_variables())
results.update(self.vars) results.update(self.vars)
results['inventory_hostname'] = self.name results['inventory_hostname'] = self.name
results['inventory_hostname_short'] = self.name.split('.')[0]
groups = self.get_groups() groups = self.get_groups()
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'])
return results return results