openstack
/
devstack
Code Issues Proposed changes

Merge "Create block-storage endpoint for cinder"

This commit is contained in:
Zuul 2018-01-31 08:27:54 +00:00 committed by Gerrit Code Review
parent 1af2bea823 cda2cb557f
commit 632d87a17c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cinder
View File

@ -343,8 +343,15 @@ function create_cinder_accounts {
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"
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 \
"volume" \
"$REGION_NAME" \
@ -362,6 +369,11 @@ function create_cinder_accounts {
"$REGION_NAME" \
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s"
else
get_or_create_endpoint \
"block-storage" \
"$REGION_NAME" \
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/"
get_or_create_endpoint \
"volume" \
"$REGION_NAME" \