Merge "Change default host reserved memory to 2048MB from 512MB"

[apex-tripleo-heat-templates.git] / network / endpoints / endpoint_map.yaml

diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index 9c000c3..0521401 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -52,9 +52,13 @@ parameters:
       GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
       GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
       GlancePublic: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
+      GlanceRegistryAdmin: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
+      GlanceRegistryInternal: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
+      GlanceRegistryPublic: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
       HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
       HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
       HeatPublic: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
+      HorizonPublic: {protocol: 'http', port: '80', host: 'IP_ADDRESS'}
       KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
       KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
       KeystonePublic: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
@@ -72,6 +76,10 @@ parameters:
       SwiftPublic: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
+  CloudName:
+    type: string
+    default: ''
+    description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
 
 resources:
 
@@ -80,18 +88,21 @@ resources:
     properties:
       EndpointName: CeilometerInternal
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: CeilometerApiVirtualIP}
   CeilometerPublic:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: CeilometerPublic
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: PublicVirtualIP}
   CeilometerAdmin:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: CeilometerAdmin
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: CeilometerApiVirtualIP}
 
   CinderInternal:
@@ -99,6 +110,7 @@ resources:
     properties:
       EndpointName: CinderInternal
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: CinderApiVirtualIP}
       UriSuffix: '/v1/%(tenant_id)s'
   CinderPublic:
@@ -106,6 +118,7 @@ resources:
     properties:
       EndpointName: CinderPublic
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: PublicVirtualIP}
       UriSuffix: '/v1/%(tenant_id)s'
   CinderAdmin:
@@ -113,6 +126,7 @@ resources:
     properties:
       EndpointName: CinderAdmin
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: CinderApiVirtualIP}
       UriSuffix: '/v1/%(tenant_id)s'
 
@@ -121,6 +135,7 @@ resources:
     properties:
       EndpointName: CinderInternal
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: CinderApiVirtualIP}
       UriSuffix: '/v2/%(tenant_id)s'
   CinderV2Public:
@@ -128,6 +143,7 @@ resources:
     properties:
       EndpointName: CinderPublic
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: PublicVirtualIP}
       UriSuffix: '/v2/%(tenant_id)s'
   CinderV2Admin:
@@ -135,6 +151,7 @@ resources:
     properties:
       EndpointName: CinderAdmin
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: CinderApiVirtualIP}
       UriSuffix: '/v2/%(tenant_id)s'
 
@@ -143,19 +160,40 @@ resources:
     properties:
       EndpointName: GlanceInternal
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: GlanceApiVirtualIP}
   GlancePublic:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: GlancePublic
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: PublicVirtualIP}
   GlanceAdmin:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: GlanceAdmin
       EndpointMap: { get_param: EndpointMap }
+      CloudName: {get_param: CloudName}
       IP: {get_param: GlanceApiVirtualIP}
+  GlanceRegistryInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: GlanceInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: GlanceRegistryVirtualIP}
+  GlanceRegistryPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: GlancePublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+  GlanceRegistryAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: GlanceAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: GlanceRegistryVirtualIP}
 
   HeatInternal:
     type: OS::TripleO::Endpoint
@@ -163,6 +201,7 @@ resources:
       EndpointName: HeatInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: HeatApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v1/%(tenant_id)s'
   HeatPublic:
     type: OS::TripleO::Endpoint
@@ -170,6 +209,7 @@ resources:
       EndpointName: HeatPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v1/%(tenant_id)s'
   HeatAdmin:
     type: OS::TripleO::Endpoint
@@ -177,14 +217,25 @@ resources:
       EndpointName: HeatAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: HeatApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v1/%(tenant_id)s'
 
+  HorizonPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: HeatPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
+      UriSuffix: '/dashboard'
+
   KeystoneInternal:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: KeystoneInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: KeystonePublicApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2.0'
   KeystonePublic:
     type: OS::TripleO::Endpoint
@@ -192,6 +243,7 @@ resources:
       EndpointName: KeystonePublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2.0'
   KeystoneAdmin:
     type: OS::TripleO::Endpoint
@@ -199,6 +251,7 @@ resources:
       EndpointName: KeystoneAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: KeystoneAdminApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2.0'
   KeystoneEC2:
     type: OS::TripleO::Endpoint
@@ -206,6 +259,7 @@ resources:
       EndpointName: KeystoneInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: KeystonePublicApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2.0/ec2tokens'
 
   NeutronInternal:
@@ -214,18 +268,21 @@ resources:
       EndpointName: NeutronInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NeutronApiVirtualIP}
+      CloudName: {get_param: CloudName}
   NeutronPublic:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: NeutronPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
   NeutronAdmin:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: NeutronAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NeutronApiVirtualIP}
+      CloudName: {get_param: CloudName}
 
   NovaInternal:
     type: OS::TripleO::Endpoint
@@ -233,6 +290,7 @@ resources:
       EndpointName: NovaInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NovaApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2/%(tenant_id)s'
   NovaPublic:
     type: OS::TripleO::Endpoint
@@ -240,6 +298,7 @@ resources:
       EndpointName: NovaPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2/%(tenant_id)s'
   NovaAdmin:
     type: OS::TripleO::Endpoint
@@ -247,6 +306,7 @@ resources:
       EndpointName: NovaAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NovaApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v2/%(tenant_id)s'
   NovaV3Internal:
     type: OS::TripleO::Endpoint
@@ -254,6 +314,7 @@ resources:
       EndpointName: NovaInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NovaApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v3'
   NovaV3Public:
     type: OS::TripleO::Endpoint
@@ -261,6 +322,7 @@ resources:
       EndpointName: NovaPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v3'
   NovaV3Admin:
     type: OS::TripleO::Endpoint
@@ -268,6 +330,7 @@ resources:
       EndpointName: NovaAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NovaApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v3'
 
   NovaEC2Internal:
@@ -276,6 +339,7 @@ resources:
       EndpointName: NovaEC2Internal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NovaApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/services/Cloud'
   NovaEC2Public:
     type: OS::TripleO::Endpoint
@@ -283,6 +347,7 @@ resources:
       EndpointName: NovaEC2Public
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/services/Cloud'
   NovaEC2Admin:
     type: OS::TripleO::Endpoint
@@ -290,6 +355,7 @@ resources:
       EndpointName: NovaEC2Admin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: NovaApiVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/services/Admin'
 
   SwiftInternal:
@@ -298,6 +364,7 @@ resources:
       EndpointName: SwiftInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: SwiftProxyVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v1/AUTH_%(tenant_id)s'
   SwiftPublic:
     type: OS::TripleO::Endpoint
@@ -305,6 +372,7 @@ resources:
       EndpointName: SwiftPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
       UriSuffix: '/v1/AUTH_%(tenant_id)s'
   SwiftAdmin:
     type: OS::TripleO::Endpoint
@@ -312,6 +380,7 @@ resources:
       EndpointName: SwiftAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: SwiftProxyVirtualIP}
+      CloudName: {get_param: CloudName}
       # No Suffix for the Admin interface
   SwiftS3Internal:
     type: OS::TripleO::Endpoint
@@ -319,18 +388,21 @@ resources:
       EndpointName: SwiftInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: SwiftProxyVirtualIP}
+      CloudName: {get_param: CloudName}
   SwiftS3Public:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: SwiftPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
+      CloudName: {get_param: CloudName}
   SwiftS3Admin:
     type: OS::TripleO::Endpoint
     properties:
       EndpointName: SwiftAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: SwiftProxyVirtualIP}
+      CloudName: {get_param: CloudName}
 
 outputs:
   endpoint_map:
@@ -347,9 +419,13 @@ outputs:
       GlanceInternal: {get_attr: [ GlanceInternal, endpoint] }
       GlancePublic: {get_attr: [ GlancePublic, endpoint] }
       GlanceAdmin: {get_attr: [ GlanceAdmin, endpoint] }
+      GlanceRegistryInternal: {get_attr: [ GlanceRegistryInternal, endpoint] }
+      GlanceRegistryPublic: {get_attr: [ GlanceRegistryPublic, endpoint] }
+      GlanceRegistryAdmin: {get_attr: [ GlanceRegistryAdmin, endpoint] }
       HeatInternal: {get_attr: [ HeatInternal, endpoint] }
       HeatPublic: {get_attr: [ HeatPublic, endpoint] }
       HeatAdmin: {get_attr: [ HeatAdmin, endpoint] }
+      HorizonPublic: {get_attr: [ HorizonPublic, endpoint] }
       KeystoneInternal: {get_attr: [ KeystoneInternal, endpoint] }
       KeystonePublic: {get_attr: [ KeystonePublic, endpoint] }
       KeystoneAdmin: {get_attr: [ KeystoneAdmin, endpoint] }