openstack/devstack
Code Issues Proposed changes

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

Browse Source 
Change-Id: I41eac84a48e8e716b77b7c874244c626b5df3006
This commit is contained in:
Gabriel Hurley 2012-02-13 12:29:23 -08:00
parent 9ca0cd1d38
commit a3a496f9c2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/default_catalog.templates
View File

@ -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.adminURL = http://%SERVICE_HOST%:8080/
catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s
catalog.RegionOne.object_store.name = 'Swift Service' 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'

7
files/keystone_data.sh
View File

@ -32,7 +32,6 @@ NETADMIN_ROLE=`get_id keystone role-create --name=netadmin`
# Add Roles to Users in Tenants # Add Roles to Users in Tenants
keystone add-user-role $ADMIN_USER $ADMIN_ROLE $ADMIN_TENANT 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 $MEMBER_ROLE $DEMO_TENANT
keystone add-user-role $DEMO_USER $SYSADMIN_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" \ --type="object-store" \
--description="Swift Service" --description="Swift Service"
fi 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 # create ec2 creds and parse the secret and access key returned
RESULT=`keystone ec2-create-credentials --tenant_id=$ADMIN_TENANT --user_id=$ADMIN_USER` RESULT=`keystone ec2-create-credentials --tenant_id=$ADMIN_TENANT --user_id=$ADMIN_USER`