Merge "Fix Heat/Cloud formation catalog template"

This commit is contained in:
Jenkins 2014-01-13 18:39:54 +00:00 committed by Gerrit Code Review
commit 13f796a348

View File

@ -47,9 +47,14 @@ catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292
catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292
catalog.RegionOne.image.name = Image 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.cloudformation.publicURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.cloudformation.adminURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.cloudformation.internalURL = http://%SERVICE_HOST%:8000/v1
catalog.RegionOne.cloudformation.name = Heat CloudFormation Service
catalog.RegionOne.orchestration.publicURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s
catalog.RegionOne.orchestration.adminURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s
catalog.RegionOne.orchestration.internalURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s
catalog.RegionOne.orchestration.name = Heat Service
catalog.RegionOne.metering.publicURL = http://%SERVICE_HOST%:8777/v1