From: Zane Bitter <zbitter@redhat.com>
Date: Tue, 2 Feb 2016 22:46:46 +0000 (-0500)
Subject: Fix endpoint names
X-Git-Tag: opnfv-6.0.0~2200^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6181e6dfdc746019e9dde51adb19025de4507aad;p=apex-tripleo-heat-templates.git

Fix endpoint names

The commit daad3d4224f12d2c23c41a70cdf522e7c55536ba added a bunch of new
endpoints, but failed to use the new input data in calculating the
outputs: the GlanceRegistry ones use the Glance endpoints and the
Horizon one the Heat endpoint. This would cause anything querying these
endpoints from the endpoints map to get the wrong ports.

Change-Id: I8e1780b26e285187142be41b4f3aae3efe7eaaee
---

diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index f6063c0e..096ee558 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -185,19 +185,19 @@ resources:
   GlanceRegistryInternal:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: GlanceInternal
+      EndpointName: GlanceRegistryInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: GlanceRegistryVirtualIP}
   GlanceRegistryPublic:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: GlancePublic
+      EndpointName: GlanceRegistryPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
   GlanceRegistryAdmin:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: GlanceAdmin
+      EndpointName: GlanceRegistryAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: GlanceRegistryVirtualIP}
 
@@ -229,7 +229,7 @@ resources:
   HorizonPublic:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: HeatPublic
+      EndpointName: HorizonPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
       CloudName: {get_param: CloudName}
@@ -481,4 +481,4 @@ outputs:
       SwiftS3Admin: {get_attr: [ SwiftS3Admin, endpoint] }
       SaharaInternal: {get_attr: [ SaharaInternal, endpoint] }
       SaharaPublic: {get_attr: [ SaharaPublic, endpoint] }
-      SaharaAdmin: {get_attr: [ SaharaAdmin, endpoint] }
\ No newline at end of file
+      SaharaAdmin: {get_attr: [ SaharaAdmin, endpoint] }