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

Fix duplicate IPs

Browse source 
Fixes #58799

Fixes duplicate IP addresses in fqdn_ip grains
This commit is contained in:
Jakub Recman 2020-10-25 23:25:29 +01:00 • committed by Daniel Wozniak
parent d536f4b1f4
commit 1da988dcb9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/58799.fixed Normal file
View file

@ -0,0 +1 @@
Fix duplicate IP addresses in fqdn_ip4 and fqdn_ip6 grains

2
salt/grains/core.py
View file

@ -2421,7 +2421,7 @@ def ip_fqdn():
try:
start_time = datetime.datetime.utcnow()
info = socket.getaddrinfo(_fqdn, None, socket_type)
ret[key] = list(item[4][0] for item in info)
ret[key] = list({item[4][0] for item in info})
except (OSError, UnicodeError):
timediff = datetime.datetime.utcnow() - start_time
if timediff.seconds > 5 and __opts__["__role"] == "master":