Support both SQL and templated keystone backend. This will add an
additional endpoint to go with v1.
Change-Id: I19168d55c2ffad2b1cd668b6c1341dc8e49e9c1f
| ... | ... |
@@ -24,6 +24,12 @@ catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id |
| 24 | 24 |
catalog.RegionOne.volume.name = Volume Service |
| 25 | 25 |
|
| 26 | 26 |
|
| 27 |
+catalog.RegionOne.volumev2.publicURL = http://%SERVICE_HOST%:8776/v2/$(tenant_id)s |
|
| 28 |
+catalog.RegionOne.volumev2.adminURL = http://%SERVICE_HOST%:8776/v2/$(tenant_id)s |
|
| 29 |
+catalog.RegionOne.volumev2.internalURL = http://%SERVICE_HOST%:8776/v2/$(tenant_id)s |
|
| 30 |
+catalog.RegionOne.volumev2.name = Volume Service V2 |
|
| 31 |
+ |
|
| 32 |
+ |
|
| 27 | 33 |
catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud |
| 28 | 34 |
catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin |
| 29 | 35 |
catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud |
| ... | ... |
@@ -339,6 +339,18 @@ create_cinder_accounts() {
|
| 339 | 339 |
--publicurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \ |
| 340 | 340 |
--adminurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \ |
| 341 | 341 |
--internalurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" |
| 342 |
+ CINDER_V2_SERVICE=$(keystone service-create \ |
|
| 343 |
+ --name=cinder \ |
|
| 344 |
+ --type=volumev2 \ |
|
| 345 |
+ --description="Cinder Volume Service V2" \ |
|
| 346 |
+ | grep " id " | get_field 2) |
|
| 347 |
+ keystone endpoint-create \ |
|
| 348 |
+ --region RegionOne \ |
|
| 349 |
+ --service_id $CINDER_V2_SERVICE \ |
|
| 350 |
+ --publicurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \ |
|
| 351 |
+ --adminurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \ |
|
| 352 |
+ --internalurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" |
|
| 353 |
+ |
|
| 342 | 354 |
fi |
| 343 | 355 |
fi |
| 344 | 356 |
} |