Merge "Create block-storage endpoint for cinder"
This commit is contained in:
commit
632d87a17c
12
lib/cinder
12
lib/cinder
@ -343,8 +343,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" \
|
||||||
@ -362,6 +369,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" \
|
||||||
|
Loading…
Reference in New Issue
Block a user