Browse code
Merge "Fix Heat/Cloud formation catalog template"
Jenkins authored on 2014/01/14 03:39:54Showing 1 changed files
| ... | ... |
@@ -47,9 +47,14 @@ 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 |
| 54 | 59 |
|
| 55 | 60 |
catalog.RegionOne.metering.publicURL = http://%SERVICE_HOST%:8777/v1 |