From b934212e527fed36f20a568c5a9734d5b99c11e3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 26 Oct 2024 03:08:36 +0900 Subject: [PATCH] Remove remaining reference to volume v2 API ... because it was already removed from cinder. Also drop project_id template from volume v3 API because recent cinder releases no longer requires it. Change-Id: I366b045e63c28b9201a0340d9e30188f3b88093a --- tools/sample_data.sh | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tools/sample_data.sh b/tools/sample_data.sh index 35fdec99fd..662952c9e6 100755 --- a/tools/sample_data.sh +++ b/tools/sample_data.sh @@ -162,28 +162,16 @@ fi # # Volume service # -openstack service create --name=cinderv2 \ - --description="Cinder Volume Service V2" \ - volumev2 -if [[ -z "$DISABLE_ENDPOINTS" ]]; then - openstack endpoint create --region RegionOne \ - volume public "http://$CONTROLLER_PUBLIC_ADDRESS:8776/v2/\$(project_id)s" - openstack endpoint create --region RegionOne \ - volume admin "http://$CONTROLLER_ADMIN_ADDRESS:8776/v2/\$(project_id)s" - openstack endpoint create --region RegionOne \ - volume internal "http://$CONTROLLER_INTERNAL_ADDRESS:8776/v2/\$(project_id)s" -fi - openstack service create --name=cinderv3 \ --description="Cinder Volume Service V3" \ volumev3 if [[ -z "$DISABLE_ENDPOINTS" ]]; then openstack endpoint create --region RegionOne \ - volume public "http://$CONTROLLER_PUBLIC_ADDRESS:8776/v3/\$(project_id)s" + volume public "http://$CONTROLLER_PUBLIC_ADDRESS:8776/v3" openstack endpoint create --region RegionOne \ - volume admin "http://$CONTROLLER_ADMIN_ADDRESS:8776/v3/\$(project_id)s" + volume admin "http://$CONTROLLER_ADMIN_ADDRESS:8776/v3" openstack endpoint create --region RegionOne \ - volume internal "http://$CONTROLLER_INTERNAL_ADDRESS:8776/v3/\$(project_id)s" + volume internal "http://$CONTROLLER_INTERNAL_ADDRESS:8776/v3" fi #