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

Don't require 'domain' to be present before checking fqdn_ip* grains

Browse source 
Fixes #34129
This commit is contained in:
rallytime 2016-06-24 15:43:31 -06:00
parent 805171c949
commit 5f45a8ff73
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/grains/core.py
View file

@ -1603,9 +1603,8 @@ def fqdn_ip4():
addrs = []
try:
hostname_grains = hostname()
if hostname_grains['domain']:
info = socket.getaddrinfo(hostname_grains['fqdn'], None, socket.AF_INET)
addrs = list(set(item[4][0] for item in info))
info = socket.getaddrinfo(hostname_grains['fqdn'], None, socket.AF_INET)
addrs = list(set(item[4][0] for item in info))
except socket.error:
pass
return {'fqdn_ip4': addrs}
@ -1633,9 +1632,8 @@ def fqdn_ip6():
addrs = []
try:
hostname_grains = hostname()
if hostname_grains['domain']:
info = socket.getaddrinfo(hostname_grains['fqdn'], None, socket.AF_INET6)
addrs = list(set(item[4][0] for item in info))
info = socket.getaddrinfo(hostname_grains['fqdn'], None, socket.AF_INET6)
addrs = list(set(item[4][0] for item in info))
except socket.error:
pass
return {'fqdn_ip6': addrs}