saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #890 from teancom/develop

Browse source 
very small change
This commit is contained in:
Thomas S Hatch 2012-03-12 20:28:04 -07:00
commit 1a4f244a88
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/grains/core.py
View file

@ -461,6 +461,7 @@ def hostname():
comps = grains['fqdn'].split('.')
grains['host'] = comps[0]
grains['localhost'] = socket.gethostname()
grains['localfqdn'] = __salt__['cmd.run']('hostname -f').strip()
if len(comps) > 1:
grains['domain'] = '.'.join(comps[1:])
else: