@@ -311,10 +311,6 @@ function configure_cinder {

         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"

@@ -73,7 +73,6 @@ GLANCE_CACHE_CONF=$GLANCE_CONF_DIR/glance-cache.conf

 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 @@ function configure_glance {

         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

@@ -346,11 +346,6 @@ function configure_tempest {

         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