Remove GLANCE_V1_ENABLED option
This option sets enable_v1_api in glance-api.conf, a setting that was removed by change Ia086230cc8c92f7b7dfd5b001923110d5bc55d4d in July 2018, so remove the devstack option from lib/glance. It occurs in two other places: This option is used in lib/cinder to set an option that was removed from Cinder by change Ice379db9ae83420bacf9e96e242c7515930eae86 in Queens, so remove the related code. When this option is False, it is used in lib/tempest to set [image-feature-enabled]/api_v1 to False in the tempest config file. However, the default value of ths setting has been False since change Iab3a209c744375bf2618afc00a3f7731b62f557e in Sept 2018, so remove the related code. Change-Id: I4b18a0a388ed7e7a392fabeac613778e0d23dee7
This commit is contained in:
parent
02da0c40f9
commit
ee5cf747d8
@ -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"
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user