Browse code

Merge "Add Cinder V2 API to keystone catalog"

Jenkins authored on 2013/08/14 05:48:42
Showing 2 changed files
... ...
@@ -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
... ...
@@ -343,6 +343,18 @@ create_cinder_accounts() {
343 343
                 --publicurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \
344 344
                 --adminurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \
345 345
                 --internalurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s"
346
+            CINDER_V2_SERVICE=$(keystone service-create \
347
+                --name=cinder \
348
+                --type=volumev2 \
349
+                --description="Cinder Volume Service V2" \
350
+                | grep " id " | get_field 2)
351
+            keystone endpoint-create \
352
+                --region RegionOne \
353
+                --service_id $CINDER_V2_SERVICE \
354
+                --publicurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \
355
+                --adminurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \
356
+                --internalurl "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s"
357
+
346 358
         fi
347 359
     fi
348 360
 }