openstack/devstack
Code Issues Proposed changes

Merge "Fixes for heat keystone registration."

Browse Source
This commit is contained in:
Jenkins 2012-09-08 05:30:46 +00:00 committed by Gerrit Code Review
commit b60badce7f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/default_catalog.templates
View File

@ -35,7 +35,7 @@ catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292
catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292
catalog.RegionOne.image.name = Image Service
catalog.RegionOne.heat.publicURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.heat.adminURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.heat.internalURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.heat.name = Heat Service
catalog.RegionOne.orchestration.publicURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.orchestration.adminURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.orchestration.internalURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.orchestration.name = Heat Service

2
stack.sh
View File

@ -2081,7 +2081,7 @@ if is_service_enabled key; then
ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \
SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \
S3_SERVICE_PORT=$S3_SERVICE_PORT KEYSTONE_CATALOG_BACKEND=$KEYSTONE_CATALOG_BACKEND \
DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES \
DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES HEAT_API_PORT=$HEAT_API_PORT \
bash -x $FILES/keystone_data.sh
# Set up auth creds now that keystone is bootstrapped