commit 13f796a348a6da0838edba68cd00eb75646932fe
author Jenkins <jenkins@review.openstack.org> Mon Jan 13 18:39:54 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 13 18:39:54 2014 +0000
tree 366fd69e415f1b8181d101b55a49cbc7a9c07346
parent 434fac566b3880fe0a9001238411c50bb12d7f3e
parent 1b0eccdf75cf70a26c1b2ae6b9beaa75ebaf7a6a

Merge "Fix Heat/Cloud formation catalog template"

files/default_catalog.templates

diff --git a/files/default_catalog.templates b/files/default_catalog.templates
index 430c42a..e64f68f 100644
--- a/files/default_catalog.templates
+++ b/files/default_catalog.templates
@@ -47,9 +47,14 @@
 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