commit 86db593653f6252331e42244aa11b59b06bde63f
author Zuul <zuul@review.openstack.org> Tue Oct 16 17:30:29 2018 +0000
committer Gerrit Code Review <review@openstack.org> Tue Oct 16 17:30:29 2018 +0000
tree 0d1a7987a70665127f2d03e3cf6c00375e430d3b
parent 80417ef53b23867e1575f9b8fa5dfce6b22c0659
parent 9a543a81acb808e4275765da7ff0f613109b6603

Merge "Don't use ipv6 for DNS SAN fields with python3"

lib/tls

diff --git a/lib/tls b/lib/tls
index e3ed3cc..217f40e 100644
--- a/lib/tls
+++ b/lib/tls
@@ -227,9 +227,13 @@
 function init_cert {
     if [[ ! -r $DEVSTACK_CERT ]]; then
         if [[ -n "$TLS_IP" ]]; then
-            # Lie to let incomplete match routines work
-            # see https://bugs.python.org/issue23239
-            TLS_IP="DNS:$TLS_IP,IP:$TLS_IP"
+            if python3_enabled; then
+                TLS_IP="IP:$TLS_IP"
+            else
+                # Lie to let incomplete match routines work with python2
+                # see https://bugs.python.org/issue23239
+                TLS_IP="DNS:$TLS_IP,IP:$TLS_IP"
+            fi
         fi
         make_cert $INT_CA_DIR $DEVSTACK_CERT_NAME $DEVSTACK_HOSTNAME "$TLS_IP"