@@ -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}"

@@ -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