Browse code

Fix Heat/Cloud formation catalog template

Cloud formation and Heat API ports where mixed.

Change-Id: I029592c4821bb93c8a1dd91519f30908efd56627
Closes-Bug: #1267355

Dirk Mueller authored on 2014/01/10 19:51:01
Showing 1 changed files
... ...
@@ -47,7 +47,12 @@ catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292
47 47
 catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292
48 48
 catalog.RegionOne.image.name = Image Service
49 49
 
50
-catalog.RegionOne.orchestration.publicURL = http://%SERVICE_HOST%:8000/v1
51
-catalog.RegionOne.orchestration.adminURL = http://%SERVICE_HOST%:8000/v1
52
-catalog.RegionOne.orchestration.internalURL = http://%SERVICE_HOST%:8000/v1
50
+catalog.RegionOne.cloudformation.publicURL = http://%SERVICE_HOST%:8000/v1
51
+catalog.RegionOne.cloudformation.adminURL = http://%SERVICE_HOST%:8000/v1
52
+catalog.RegionOne.cloudformation.internalURL = http://%SERVICE_HOST%:8000/v1
53
+catalog.RegionOne.cloudformation.name = Heat CloudFormation Service
54
+
55
+catalog.RegionOne.orchestration.publicURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s
56
+catalog.RegionOne.orchestration.adminURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s
57
+catalog.RegionOne.orchestration.internalURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s
53 58
 catalog.RegionOne.orchestration.name = Heat Service