From 4dcd8708819a1d3afe8ad43d6673d36c4254ae7a Mon Sep 17 00:00:00 2001
From: GongYongSheng <gongyongsheng@sh.99cloud.net>
Date: Wed, 13 Mar 2019 15:24:17 +0800
Subject: [PATCH] First check ipv4 then ipv6 connectivity

Change-Id: Iaeca19457d78f4f6c4b3bd8091194be31563e5e5
Closes-Bug: #1819834
---
 tripleoclient/workflows/deployment.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py
index 6c9a44625..ec6775bae 100644
--- a/tripleoclient/workflows/deployment.py
+++ b/tripleoclient/workflows/deployment.py
@@ -165,12 +165,16 @@ def wait_for_ssh_port(host):
         if (now - start) > constants.ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT:
             raise exceptions.DeploymentError(
                 "Timed out waiting for port 22 from %s" % host)
-
+        # first check ipv4 then check ipv6
         try:
             socket.socket().connect((host, 22))
             return
         except socket.error:
-            pass
+            try:
+                socket.socket(socket.AF_INET6).connect((host, 22))
+                return
+            except socket.error:
+                pass
 
         time.sleep(1)