1. devstack
  2. Commit cda2cb557f7176c431d151b32bc44eee03f73774
Browse code

Create block-storage endpoint for cinder

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

Eric Fried authored on 2017/10/11 01:49:06
Showing 1 changed files
lib/cinder
History View file @ cda2cb5
... ... 
@@ -344,9 +344,16 @@ function create_cinder_accounts {
344 344
345 345 
         create_service_user "cinder"
346 346
347 
+        # block-storage is the official service type
348 
+        get_or_create_service "cinder" "block-storage" "Cinder Volume Service"
347 349 
         get_or_create_service "cinder" "volume" "Cinder Volume Service"
348 350 
         if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then
349 351 
             get_or_create_endpoint \
352 
+                "block-storage" \
353 
+                "$REGION_NAME" \
354 
+                "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/"
355 
+
356 
+            get_or_create_endpoint \
350 357 
                 "volume" \
351 358 
                 "$REGION_NAME" \
352 359 
                 "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(project_id)s"
... ... 
@@ -364,6 +371,11 @@ function create_cinder_accounts {
364 364 
                 "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s"
365 365 
         else
366 366 
             get_or_create_endpoint \
367 
+                "block-storage" \
368 
+                "$REGION_NAME" \
369 
+                "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/"
370 
+
371 
+            get_or_create_endpoint \
367 372 
                 "volume" \
368 373 
                 "$REGION_NAME" \
369 374 
                 "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v1/\$(project_id)s"