openstack/devstack
Code Issues Proposed changes

Merge "Remove GLANCE_V1_ENABLED option"

Browse Source
This commit is contained in:
Zuul 2020-07-07 19:16:32 +00:00 committed by Gerrit Code Review
commit 2ecd182385
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cinder
View File

@ -311,10 +311,6 @@ function configure_cinder {
iniset $CINDER_CONF DEFAULT glance_ca_certificates_file $SSL_BUNDLE_FILE iniset $CINDER_CONF DEFAULT glance_ca_certificates_file $SSL_BUNDLE_FILE
fi fi
if [ "$GLANCE_V1_ENABLED" != "True" ]; then
iniset $CINDER_CONF DEFAULT glance_api_version 2
fi
# Set nova credentials (used for os-assisted-snapshots) # Set nova credentials (used for os-assisted-snapshots)
configure_keystone_authtoken_middleware $CINDER_CONF nova nova configure_keystone_authtoken_middleware $CINDER_CONF nova nova
iniset $CINDER_CONF nova region_name "$REGION_NAME" iniset $CINDER_CONF nova region_name "$REGION_NAME"

7
lib/glance
View File

@ -73,7 +73,6 @@ GLANCE_CACHE_CONF=$GLANCE_CONF_DIR/glance-cache.conf
GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json
GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf
GLANCE_IMAGE_IMPORT_CONF=$GLANCE_CONF_DIR/glance-image-import.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 if is_service_enabled tls-proxy; then
GLANCE_SERVICE_PROTOCOL="https" 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" iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,ploop"
fi 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 # Glance multiple store Store specific configs
if [[ "$GLANCE_ENABLE_MULTIPLE_STORES" == "True" ]]; then if [[ "$GLANCE_ENABLE_MULTIPLE_STORES" == "True" ]]; then
iniset $GLANCE_API_CONF glance_store default_backend $GLANCE_DEFAULT_BACKEND iniset $GLANCE_API_CONF glance_store default_backend $GLANCE_DEFAULT_BACKEND

5
lib/tempest
View File

@ -346,11 +346,6 @@ function configure_tempest {
iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso" iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
fi fi
# Image Features
if [ "$GLANCE_V1_ENABLED" != "True" ]; then
iniset $TEMPEST_CONFIG image-feature-enabled api_v1 False
fi
# Compute # Compute
iniset $TEMPEST_CONFIG compute image_ref $image_uuid iniset $TEMPEST_CONFIG compute image_ref $image_uuid
iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid_alt iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid_alt