@@ -344,6 +344,10 @@ 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

+

     # Register SSL certificates if provided

     if is_ssl_enabled_service cinder; then

         ensure_certificates CINDER

@@ -57,6 +57,7 @@ GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json

 GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf

 GLANCE_GLARE_CONF=$GLANCE_CONF_DIR/glance-glare.conf

 GLANCE_GLARE_PASTE_INI=$GLANCE_CONF_DIR/glance-glare-paste.ini

+GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-True}

 if is_ssl_enabled_service "glance" || is_service_enabled tls-proxy; then

     GLANCE_SERVICE_PROTOCOL="https"

@@ -134,6 +135,12 @@ 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

+

     # Store specific configs

     iniset $GLANCE_API_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/

     if is_service_enabled g-glare; then

@@ -296,6 +296,9 @@ function configure_tempest {

     # Image Features

     iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True

+    if [ "$GLANCE_V1_ENABLED" != "True" ]; then

+        iniset $TEMPEST_CONFIG image-feature-enabled api_v1 False

+    fi

     # Compute

     iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED