openstack/devstack
Code Issues Proposed changes

Create block-storage endpoint for cinder

Browse Source 
block-storage is the official service type for cinder, according to the
service-types-authority.  Add it as a service in devstack, with cinder's
unversioned endpoint, to enable proper discovery.

Change-Id: I75cf7212678f7f270c3c32f0bce227dbbf6b466d
This commit is contained in:
Eric Fried
2017-10-10 11:49:06 -05:00
parent a29329b559
commit cda2cb557f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cinder
View File

@@ -344,8 +344,15 @@ function create_cinder_accounts {
create_service_user "cinder" create_service_user "cinder"
# block-storage is the official service type
get_or_create_service "cinder" "block-storage" "Cinder Volume Service"
get_or_create_service "cinder" "volume" "Cinder Volume Service" get_or_create_service "cinder" "volume" "Cinder Volume Service"
if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then
get_or_create_endpoint \
"block-storage" \
"$REGION_NAME" \
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/"
get_or_create_endpoint \ get_or_create_endpoint \
"volume" \ "volume" \
"$REGION_NAME" \ "$REGION_NAME" \
@@ -363,6 +370,11 @@ function create_cinder_accounts {
"$REGION_NAME" \ "$REGION_NAME" \
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s" "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s"
else else
get_or_create_endpoint \
"block-storage" \
"$REGION_NAME" \
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/"
get_or_create_endpoint \ get_or_create_endpoint \
"volume" \ "volume" \
"$REGION_NAME" \ "$REGION_NAME" \