commit 6fd4daf8dcfb38260fdbfb90f7ccbc31abd059d1
author Zuul <zuul@review.opendev.org> Wed Jul 08 10:57:04 2020 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 08 10:57:04 2020 +0000
tree 2b1ee5138ba53a4da0f8829bcb9ce17dd637941b
parent 2ecd1823850ae0e00ad0ecebbbceb312be60ccf4
parent 6184dea966d56f13f15d926dbb09e527ae3ba39e

Merge "Remove n-api-metadata service from compute nodes"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index b1e3d0d..b892b91 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -311,10 +311,6 @@
         iniset $CINDER_CONF DEFAULT glance_ca_certificates_file $SSL_BUNDLE_FILE
     fi
 
-    if [ "$GLANCE_V1_ENABLED" != "True" ]; then
-        iniset $CINDER_CONF DEFAULT glance_api_version 2
-    fi
-
     # Set nova credentials (used for os-assisted-snapshots)
     configure_keystone_authtoken_middleware $CINDER_CONF nova nova
     iniset $CINDER_CONF nova region_name "$REGION_NAME"

lib/glance

diff --git a/lib/glance b/lib/glance
index 6d252e3..b9c23aa 100644
--- a/lib/glance
+++ b/lib/glance
@@ -73,7 +73,6 @@
 GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json
 GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf
 GLANCE_IMAGE_IMPORT_CONF=$GLANCE_CONF_DIR/glance-image-import.conf
-GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-False}
 
 if is_service_enabled tls-proxy; then
     GLANCE_SERVICE_PROTOCOL="https"
@@ -152,12 +151,6 @@
         iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,ploop"
     fi
 
-    # NOTE(flaper87): To uncomment as soon as all services consuming Glance are
-    # able to consume V2 entirely.
-    if [ "$GLANCE_V1_ENABLED" != "True" ]; then
-        iniset $GLANCE_API_CONF DEFAULT enable_v1_api False
-    fi
-
     # Glance multiple store Store specific configs
     if [[ "$GLANCE_ENABLE_MULTIPLE_STORES" == "True" ]]; then
         iniset $GLANCE_API_CONF glance_store default_backend $GLANCE_DEFAULT_BACKEND

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 0d6bdc9..47bdc22 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -346,11 +346,6 @@
         iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
     fi
 
-    # Image Features
-    if [ "$GLANCE_V1_ENABLED" != "True" ]; then
-        iniset $TEMPEST_CONFIG image-feature-enabled api_v1 False
-    fi
-
     # Compute
     iniset $TEMPEST_CONFIG compute image_ref $image_uuid
     iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid_alt

lib/tls

diff --git a/lib/tls b/lib/tls
index baafb59..861496d 100644
--- a/lib/tls
+++ b/lib/tls
@@ -249,7 +249,11 @@
 
     if [ "$common_name" != "$SERVICE_HOST" ]; then
         if is_ipv4_address "$SERVICE_HOST" ; then
-            alt_names="$alt_names,IP:$SERVICE_HOST"
+            if [[ -z "$alt_names" ]]; then
+                alt_names="IP:$SERVICE_HOST"
+            else
+                alt_names="$alt_names,IP:$SERVICE_HOST"
+            fi
         fi
     fi