From 1b0eccdf75cf70a26c1b2ae6b9beaa75ebaf7a6a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 10 Jan 2014 11:51:01 +0100 Subject: [PATCH] Fix Heat/Cloud formation catalog template Cloud formation and Heat API ports where mixed. Change-Id: I029592c4821bb93c8a1dd91519f30908efd56627 Closes-Bug: #1267355 --- files/default_catalog.templates | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/files/default_catalog.templates b/files/default_catalog.templates index 277904a8e3..debcedfb5b 100644 --- a/files/default_catalog.templates +++ b/files/default_catalog.templates @@ -47,7 +47,12 @@ 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