openstack/shade
Code Issues Proposed changes

Merge "Fix address format used in find_best_address()"

Browse Source
This commit is contained in:
Zuul 2018-01-18 10:45:27 +00:00 committed by Gerrit Code Review
commit 3859f6dbe3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shade/meta.py
View File

@ -226,7 +226,10 @@ def find_best_address(addresses, family, public=False, cloud_public=True):
try:
connect_socket = socket.socket(family, socket.SOCK_STREAM, 0)
connect_socket.settimeout(1)
connect_socket.connect((address, 22, 0, 0))
if family == socket.AF_INET4:
connect_socket.connect((address, 22))
else:
connect_socket.connect((address, 22, 0, 0))
return address
except Exception:
pass