From 33f8f6e68419702df3cb4b8d8af2f6587ebae527 Mon Sep 17 00:00:00 2001
From: Dan Smith <dansmith@redhat.com>
Date: Tue, 21 Jul 2020 19:41:48 -0700
Subject: [PATCH] Remove standalone requirement for glance import

As of the referenced patch in glance, we can do import in wsgi mode.
Also remove the enforcement that import methods are disabled.

Change-Id: I8da4b4ad6105bb64c4045ca80db9742591d01564
Depends-On: https://review.opendev.org/#/c/742065
---
 functions  | 6 +-----
 lib/glance | 5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/functions b/functions
index c34e4874b3..cc1ca6cb25 100644
--- a/functions
+++ b/functions
@@ -114,11 +114,7 @@ function _upload_image {
     properties=$(_image_properties_to_arg $*)
 
     if [[ "$GLANCE_USE_IMPORT_WORKFLOW" == "True" ]]; then
-        if [[ "$GLANCE_STANDALONE" == "True" ]]; then
-            useimport="--import"
-        else
-            echo "*** Unable to use glance import workflow because glance is not standalone! ***"
-        fi
+        useimport="--import"
     fi
 
     openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" --public --container-format "$container" --disk-format "$disk" $useimport $properties < "${image}"
diff --git a/lib/glance b/lib/glance
index 3e5ebde935..2118636a46 100644
--- a/lib/glance
+++ b/lib/glance
@@ -193,11 +193,6 @@ function configure_glance {
         iniset $GLANCE_API_CONF cors allowed_origin "http://$SERVICE_HOST"
     fi
 
-    if [[ "$GLANCE_STANDALONE" == "False" ]]; then
-        # NOTE(danms): Do not advertise import methods if we are running in WSGI mode
-        iniset $GLANCE_API_CONF DEFAULT enabled_import_methods []
-    fi
-
     # No multiple stores for swift yet
     # Store the images in swift if enabled.
     if is_service_enabled s-proxy; then