Browse code

Adds quantum service and endpoint to keystone if quantum is enabled.

Change-Id: I41eac84a48e8e716b77b7c874244c626b5df3006

Gabriel Hurley authored on 2012/02/14 05:29:23
Showing 2 changed files
... ...
@@ -28,3 +28,9 @@ catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(
28 28
 catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/
29 29
 catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s
30 30
 catalog.RegionOne.object_store.name = 'Swift Service'
31
+
32
+
33
+catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/
34
+catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/
35
+catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/
36
+catalog.RegionOne.network.name = 'Quantum Service'
... ...
@@ -32,7 +32,6 @@ NETADMIN_ROLE=`get_id keystone role-create --name=netadmin`
32 32
 
33 33
 
34 34
 # Add Roles to Users in Tenants
35
-
36 35
 keystone add-user-role $ADMIN_USER $ADMIN_ROLE $ADMIN_TENANT
37 36
 keystone add-user-role $DEMO_USER $MEMBER_ROLE $DEMO_TENANT
38 37
 keystone add-user-role $DEMO_USER $SYSADMIN_ROLE $DEMO_TENANT
... ...
@@ -70,6 +69,12 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
70 70
                                  --type="object-store" \
71 71
                                  --description="Swift Service"
72 72
 fi
73
+if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
74
+    keystone service-create \
75
+                                 --name=quantum \
76
+                                 --type=network \
77
+                                 --description="Quantum Service"
78
+fi
73 79
 
74 80
 # create ec2 creds and parse the secret and access key returned
75 81
 RESULT=`keystone ec2-create-credentials --tenant_id=$ADMIN_TENANT --user_id=$ADMIN_USER`