First check ipv4 then ipv6 connectivity
Change-Id: Iaeca19457d78f4f6c4b3bd8091194be31563e5e5 Closes-Bug: #1819834
This commit is contained in:
parent
8a30b3ccab
commit
4dcd870881
|
@ -165,12 +165,16 @@ def wait_for_ssh_port(host):
|
||||||
if (now - start) > constants.ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT:
|
if (now - start) > constants.ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT:
|
||||||
raise exceptions.DeploymentError(
|
raise exceptions.DeploymentError(
|
||||||
"Timed out waiting for port 22 from %s" % host)
|
"Timed out waiting for port 22 from %s" % host)
|
||||||
|
# first check ipv4 then check ipv6
|
||||||
try:
|
try:
|
||||||
socket.socket().connect((host, 22))
|
socket.socket().connect((host, 22))
|
||||||
return
|
return
|
||||||
except socket.error:
|
except socket.error:
|
||||||
pass
|
try:
|
||||||
|
socket.socket(socket.AF_INET6).connect((host, 22))
|
||||||
|
return
|
||||||
|
except socket.error:
|
||||||
|
pass
|
||||||
|
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue