summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristi Nikolla <kristi@nikolla.me>2018-05-24 10:01:39 -0700
committerKristi Nikolla <kristi@nikolla.me>2018-07-05 22:44:46 +0000
commit0f7c097d7e8f679ce8d1b64ecc6fc472264419fd (patch)
tree792f85ae79332c1096b05232592663988b444029
parent7817b0c8a6c2f5a7b6493d42c44970f77c7293e4 (diff)
Remove volume v1 from devstack plugin and add block-storageHEADmaster
With volume v1 being removed from cinder, we need to stop registering the endpoint. Also it looks like devstack registers a block-storage endpoint which points to volume v3. Change-Id: I565e9d9c61436bc0ce4651f7c7029e3e0dbdf3ac
Notes
Notes (review): Code-Review+2: Kristi Nikolla <kristi@nikolla.me> Code-Review+1: wu.chunyang <wu.chunyang@99cloud.net> Workflow+1: Kristi Nikolla <kristi@nikolla.me> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 06 Jul 2018 00:05:07 +0000 Reviewed-on: https://review.openstack.org/570415 Project: openstack/mixmatch Branch: refs/heads/master
-rw-r--r--devstack/mixmatch.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/devstack/mixmatch.sh b/devstack/mixmatch.sh
index d859645..15959ac 100644
--- a/devstack/mixmatch.sh
+++ b/devstack/mixmatch.sh
@@ -85,7 +85,7 @@ function register_mixmatch {
85 if [ "$REGISTER_MIXMATCH" == "true" ]; then 85 if [ "$REGISTER_MIXMATCH" == "true" ]; then
86 # Update the endpoints 86 # Update the endpoints
87 openstack endpoint delete `get_endpoint_ids image` 87 openstack endpoint delete `get_endpoint_ids image`
88 openstack endpoint delete `get_endpoint_ids volume` 88 openstack endpoint delete `get_endpoint_ids block-storage`
89 openstack endpoint delete `get_endpoint_ids volumev2` 89 openstack endpoint delete `get_endpoint_ids volumev2`
90 openstack endpoint delete `get_endpoint_ids volumev3` 90 openstack endpoint delete `get_endpoint_ids volumev3`
91 openstack endpoint delete `get_endpoint_ids network` 91 openstack endpoint delete `get_endpoint_ids network`
@@ -98,11 +98,11 @@ function register_mixmatch {
98 "$MIXMATCH_URL/image" 98 "$MIXMATCH_URL/image"
99 99
100 get_or_create_endpoint \ 100 get_or_create_endpoint \
101 "volume" \ 101 "block-storage" \
102 "$REGION_NAME" \ 102 "$REGION_NAME" \
103 "$MIXMATCH_URL/volume/v1/\$(project_id)s" \ 103 "$MIXMATCH_URL/volume/v3/\$(project_id)s" \
104 "$MIXMATCH_URL/volume/v1/\$(project_id)s" \ 104 "$MIXMATCH_URL/volume/v3/\$(project_id)s" \
105 "$MIXMATCH_URL/volume/v1/\$(project_id)s" 105 "$MIXMATCH_URL/volume/v3/\$(project_id)s"
106 106
107 get_or_create_endpoint \ 107 get_or_create_endpoint \
108 "volumev2" \ 108 "volumev2" \