From a3a496f9c2de8ab161bbe1e5723e66659bb1072e Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Mon, 13 Feb 2012 12:29:23 -0800 Subject: [PATCH] Adds quantum service and endpoint to keystone if quantum is enabled. Change-Id: I41eac84a48e8e716b77b7c874244c626b5df3006 --- files/default_catalog.templates | 6 ++++++ files/keystone_data.sh | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/files/default_catalog.templates b/files/default_catalog.templates index b527ae5034..a5b45d7317 100644 --- a/files/default_catalog.templates +++ b/files/default_catalog.templates @@ -28,3 +28,9 @@ catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$( catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/ catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s catalog.RegionOne.object_store.name = 'Swift Service' + + +catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/ +catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/ +catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/ +catalog.RegionOne.network.name = 'Quantum Service' diff --git a/files/keystone_data.sh b/files/keystone_data.sh index 408e36d382..cc2421c9a1 100755 --- a/files/keystone_data.sh +++ b/files/keystone_data.sh @@ -32,7 +32,6 @@ NETADMIN_ROLE=`get_id keystone role-create --name=netadmin` # Add Roles to Users in Tenants - keystone add-user-role $ADMIN_USER $ADMIN_ROLE $ADMIN_TENANT keystone add-user-role $DEMO_USER $MEMBER_ROLE $DEMO_TENANT keystone add-user-role $DEMO_USER $SYSADMIN_ROLE $DEMO_TENANT @@ -70,6 +69,12 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then --type="object-store" \ --description="Swift Service" fi +if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then + keystone service-create \ + --name=quantum \ + --type=network \ + --description="Quantum Service" +fi # create ec2 creds and parse the secret and access key returned RESULT=`keystone ec2-create-credentials --tenant_id=$ADMIN_TENANT --user_id=$ADMIN_USER`