valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up hostname grain a bit

Browse Source
This commit is contained in:
Thomas S Hatch 2011-04-29 16:20:13 -06:00
parent 5c1f559ab6
commit a09fc4584e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/grains/core.py
View File

@ -129,9 +129,11 @@ def hostname():
stdout=subprocess.PIPE).communicate()[0].strip()
domain = subprocess.Popen(['dnsdomainname'],
stdout=subprocess.PIPE).communicate()[0].strip()
return {'host': host,
'domain': domain,
'fqdn': host + '.' + domain}
grains = {'host': host}
if domain:
grains['domain'] = domain
grains['fqdn'] = host + '.' + domain
return grains
def path():
'''