openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix endpoint names"

This commit is contained in:
Jenkins 2016-02-10 21:42:07 +00:00 committed by Gerrit Code Review
parent 93c392fa20 6181e6dfdc
commit 7fe9e195e3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
network/endpoints/endpoint_map.yaml
View File

@ -185,19 +185,19 @@ resources:
GlanceRegistryInternal: GlanceRegistryInternal:
type: OS::TripleO::Endpoint type: OS::TripleO::Endpoint
properties: properties:
EndpointName: GlanceInternal EndpointName: GlanceRegistryInternal
EndpointMap: { get_param: EndpointMap } EndpointMap: { get_param: EndpointMap }
IP: {get_param: GlanceRegistryVirtualIP} IP: {get_param: GlanceRegistryVirtualIP}
GlanceRegistryPublic: GlanceRegistryPublic:
type: OS::TripleO::Endpoint type: OS::TripleO::Endpoint
properties: properties:
EndpointName: GlancePublic EndpointName: GlanceRegistryPublic
EndpointMap: { get_param: EndpointMap } EndpointMap: { get_param: EndpointMap }
IP: {get_param: PublicVirtualIP} IP: {get_param: PublicVirtualIP}
GlanceRegistryAdmin: GlanceRegistryAdmin:
type: OS::TripleO::Endpoint type: OS::TripleO::Endpoint
properties: properties:
EndpointName: GlanceAdmin EndpointName: GlanceRegistryAdmin
EndpointMap: { get_param: EndpointMap } EndpointMap: { get_param: EndpointMap }
IP: {get_param: GlanceRegistryVirtualIP} IP: {get_param: GlanceRegistryVirtualIP}
@ -229,7 +229,7 @@ resources:
HorizonPublic: HorizonPublic:
type: OS::TripleO::Endpoint type: OS::TripleO::Endpoint
properties: properties:
EndpointName: HeatPublic EndpointName: HorizonPublic
EndpointMap: { get_param: EndpointMap } EndpointMap: { get_param: EndpointMap }
IP: {get_param: PublicVirtualIP} IP: {get_param: PublicVirtualIP}
CloudName: {get_param: CloudName} CloudName: {get_param: CloudName}
@ -481,4 +481,4 @@ outputs:
SwiftS3Admin: {get_attr: [ SwiftS3Admin, endpoint] } SwiftS3Admin: {get_attr: [ SwiftS3Admin, endpoint] }
SaharaInternal: {get_attr: [ SaharaInternal, endpoint] } SaharaInternal: {get_attr: [ SaharaInternal, endpoint] }
SaharaPublic: {get_attr: [ SaharaPublic, endpoint] } SaharaPublic: {get_attr: [ SaharaPublic, endpoint] }
SaharaAdmin: {get_attr: [ SaharaAdmin, endpoint] } SaharaAdmin: {get_attr: [ SaharaAdmin, endpoint] }