openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2018-10-16 17:30:29 +00:00 committed by Gerrit Code Review
commit 86db593653
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tls
View File

@ -227,10 +227,14 @@ function init_CA {
function init_cert { function init_cert {
if [[ ! -r $DEVSTACK_CERT ]]; then if [[ ! -r $DEVSTACK_CERT ]]; then
if [[ -n "$TLS_IP" ]]; then if [[ -n "$TLS_IP" ]]; then
# Lie to let incomplete match routines work 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 # see https://bugs.python.org/issue23239
TLS_IP="DNS:$TLS_IP,IP:$TLS_IP" TLS_IP="DNS:$TLS_IP,IP:$TLS_IP"
fi fi
fi
make_cert $INT_CA_DIR $DEVSTACK_CERT_NAME $DEVSTACK_HOSTNAME "$TLS_IP" make_cert $INT_CA_DIR $DEVSTACK_CERT_NAME $DEVSTACK_HOSTNAME "$TLS_IP"
# Create a cert bundle # Create a cert bundle