commit 33f8f6e68419702df3cb4b8d8af2f6587ebae527
author Dan Smith <dansmith@redhat.com> Tue Jul 21 19:41:48 2020 -0700
committer Dan Smith <dansmith@redhat.com> Wed Jul 22 07:03:57 2020 -0700
tree 5487d5317219bb7cfc46694da21e509681b99524
parent e799770f59dfa81c78599bc4313503815b210b52

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

diff --git a/functions b/functions
index c34e487..cc1ca6c 100644
--- a/functions
+++ b/functions
@@ -114,11 +114,7 @@
     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}"