Remove Block Storage API v2 support
The Block Storage API v2 was deprecated in Pike by change I913c44799cddc37c3342729ec0ef34068db5b2d4 and is (finally) being removed in Xena [0]. So remove v2 support from devstack. [0] https://wiki.openstack.org/wiki/CinderXenaPTGSummary#Removing_the_Block_Storage_API_v2 Depends-on: https://review.opendev.org/c/openstack/devstack/+/792048 Change-Id: I856d78648d28ac4cad0fb212bef1ae6ad32fca90
This commit is contained in:
parent
b04a62beff
commit
35cec0d7c0
12
lib/cinder
12
lib/cinder
@ -376,12 +376,6 @@ function create_cinder_accounts {
|
||||
"$REGION_NAME" \
|
||||
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s"
|
||||
|
||||
get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2"
|
||||
get_or_create_endpoint \
|
||||
"volumev2" \
|
||||
"$REGION_NAME" \
|
||||
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(project_id)s"
|
||||
|
||||
get_or_create_service "cinderv3" "volumev3" "Cinder Volume Service V3"
|
||||
get_or_create_endpoint \
|
||||
"volumev3" \
|
||||
@ -393,12 +387,6 @@ function create_cinder_accounts {
|
||||
"$REGION_NAME" \
|
||||
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v3/\$(project_id)s"
|
||||
|
||||
get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2"
|
||||
get_or_create_endpoint \
|
||||
"volumev2" \
|
||||
"$REGION_NAME" \
|
||||
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v2/\$(project_id)s"
|
||||
|
||||
get_or_create_service "cinderv3" "volumev3" "Cinder Volume Service V3"
|
||||
get_or_create_endpoint \
|
||||
"volumev3" \
|
||||
|
13
lib/tempest
13
lib/tempest
@ -459,13 +459,6 @@ function configure_tempest {
|
||||
iniset $TEMPEST_CONFIG validation network_for_ssh $TEMPEST_SSH_NETWORK_NAME
|
||||
|
||||
# Volume
|
||||
# Set the service catalog entry for Tempest to run on. Typically
|
||||
# used to try different Volume API version targets. The tempest
|
||||
# default it to 'volumev3'(v3 APIs endpoint) , so only set this
|
||||
# if you want to change it.
|
||||
if [[ -n "$TEMPEST_VOLUME_TYPE" ]]; then
|
||||
iniset $TEMPEST_CONFIG volume catalog_type $TEMPEST_VOLUME_TYPE
|
||||
fi
|
||||
# Only turn on TEMPEST_VOLUME_MANAGE_SNAPSHOT by default for "lvm" backends
|
||||
if [[ "$CINDER_ENABLED_BACKENDS" == *"lvm"* ]]; then
|
||||
TEMPEST_VOLUME_MANAGE_SNAPSHOT=${TEMPEST_VOLUME_MANAGE_SNAPSHOT:-True}
|
||||
@ -489,12 +482,6 @@ function configure_tempest {
|
||||
iniset $TEMPEST_CONFIG volume-feature-enabled volume_revert $(trueorfalse False TEMPEST_VOLUME_REVERT_TO_SNAPSHOT)
|
||||
local tempest_volume_min_microversion=${TEMPEST_VOLUME_MIN_MICROVERSION:-None}
|
||||
local tempest_volume_max_microversion=${TEMPEST_VOLUME_MAX_MICROVERSION:-"latest"}
|
||||
# Reset microversions to None where v2 is running which does not support microversion.
|
||||
# Both "None" means no microversion testing.
|
||||
if [[ "$TEMPEST_VOLUME_TYPE" == "volumev2" ]]; then
|
||||
tempest_volume_min_microversion=None
|
||||
tempest_volume_max_microversion=None
|
||||
fi
|
||||
if [ "$tempest_volume_min_microversion" == "None" ]; then
|
||||
inicomment $TEMPEST_CONFIG volume min_microversion
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user