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

Fix minion start issue

Browse Source
This commit is contained in:
twangboy 2019-01-22 09:43:17 -07:00 committed by Pedro Algarvio
parent 1abffb20b9
commit c3fa82a927
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/network.py
View File

@ -1935,7 +1935,7 @@ def parse_host_port(host_port):
if _s_[0] == "[": if _s_[0] == "[":
if "]" in host_port: if "]" in host_port:
host, _s_ = _s_.lstrip("[").rsplit("]", 1) host, _s_ = _s_.lstrip("[").rsplit("]", 1)
host = ipaddress.IPv6Address(host) host = ipaddress.IPv6Address(host).compressed
if _s_[0] == ":": if _s_[0] == ":":
port = int(_s_.lstrip(":")) port = int(_s_.lstrip(":"))
else: else:
@ -1953,7 +1953,7 @@ def parse_host_port(host_port):
host = _s_ host = _s_
try: try:
if not isinstance(host, ipaddress._BaseAddress): if not isinstance(host, ipaddress._BaseAddress):
host_ip = ipaddress.ip_address(host) host_ip = ipaddress.ip_address(host).compressed
host = host_ip host = host_ip
except ValueError: except ValueError:
log.debug('"%s" Not an IP address? Assuming it is a hostname.', host) log.debug('"%s" Not an IP address? Assuming it is a hostname.', host)