Merge pull request #941 from teancom/develop

remove localfqdn grain
This commit is contained in:
Thomas S Hatch 2012-03-17 14:34:26 -07:00
commit 51cb5b1840

View File

@ -461,7 +461,6 @@ 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: