The cinder v1 api is disabled by default,
the catalog entry is confusing.
Change-Id: Ifea283d8aff9f7a70b68d601c5225c3d4fe250e6
... | ... |
@@ -349,18 +349,12 @@ function create_cinder_accounts { |
349 | 349 |
|
350 | 350 |
# block-storage is the official service type |
351 | 351 |
get_or_create_service "cinder" "block-storage" "Cinder Volume Service" |
352 |
- get_or_create_service "cinder" "volume" "Cinder Volume Service" |
|
353 | 352 |
if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then |
354 | 353 |
get_or_create_endpoint \ |
355 | 354 |
"block-storage" \ |
356 | 355 |
"$REGION_NAME" \ |
357 | 356 |
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s" |
358 | 357 |
|
359 |
- get_or_create_endpoint \ |
|
360 |
- "volume" \ |
|
361 |
- "$REGION_NAME" \ |
|
362 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(project_id)s" |
|
363 |
- |
|
364 | 358 |
get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2" |
365 | 359 |
get_or_create_endpoint \ |
366 | 360 |
"volumev2" \ |
... | ... |
@@ -378,11 +372,6 @@ function create_cinder_accounts { |
378 | 378 |
"$REGION_NAME" \ |
379 | 379 |
"$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v3/\$(project_id)s" |
380 | 380 |
|
381 |
- get_or_create_endpoint \ |
|
382 |
- "volume" \ |
|
383 |
- "$REGION_NAME" \ |
|
384 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v1/\$(project_id)s" |
|
385 |
- |
|
386 | 381 |
get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2" |
387 | 382 |
get_or_create_endpoint \ |
388 | 383 |
"volumev2" \ |