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

if it is ipv6 ip_to_int will fail

Browse Source 
fixes bug introduced in #23573
This commit is contained in:
Daniel Wallace 2015-05-15 19:51:37 -05:00
parent 5263db9dd5
commit 2da98b58c8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/utils/cloud.py
View File

@ -1728,6 +1728,9 @@ def is_public_ip(ip):
'''
Determines whether an IP address falls within one of the private IP ranges
'''
if ':' in ip:
# ipv6
return True
addr = ip_to_int(ip)
if addr > 167772160 and addr < 184549375:
# 10.0.0.0/24