Refacter Endpoints into EndpointMap

Because many of the service endpoints URLs use the same patterns for
generating the URLs it makes sense to use the same templates to reduce
the copy and paste.

In the process also adds support for explicitly specifying hostnames
for use in the endpoints.  Note: DNS must be pre-configured.   The
Heat templates do not directly configure DNS.

Change-Id: Ie3270909beca3d63f2d7e4bcb04c559380ddc54d
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>

2 files changed, 429 insertions, 0 deletions

diff --git a/network/endpoints/endpoint.yaml b/network/endpoints/endpoint.yaml
new file mode 100644
index 00000000..8ffd6c4b
--- /dev/null
+++ b/network/endpoints/endpoint.yaml
@@ -0,0 +1,55 @@
+heat_template_version: 2015-04-30
+
+description: >
+  OpenStack Endpoint
+
+parameters:
+  EndpointName:
+    type: string
+    description: The name of the Endpoint being evaluated
+  EndpointMap:
+    type: json
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+  IP:
+    type: string
+    description: The IP address of the Neutron Port that the endpoint is attached to
+  UriSuffix:
+    type: string
+    default: ''
+    description: A suffix attached to the URL
+
+outputs:
+  endpoint:
+    description: >
+      A Hash containing a mapping of service endpoints to ports, protocols, uris
+      assigned IPs, and hostnames for a specific endpoint
+    value:
+      port: {get_param: [EndpointMap, {get_param: EndpointName }, port] }
+      protocol: {get_param: [EndpointMap, {get_param: EndpointName }, protocol] }
+      host:
+        str_replace:
+          template: {get_param: [EndpointMap, {get_param: EndpointName }, host]}
+          params: {IP_ADDRESS: {get_param: IP} }
+      uri:
+        list_join:
+          - ''
+          - - {get_param: [EndpointMap, {get_param: EndpointName }, protocol] }
+            - '://'
+            - str_replace:
+                template: {get_param: [EndpointMap, {get_param: EndpointName }, host]}
+                params: {IP_ADDRESS: {get_param: IP} }
+            - ':'
+            - {get_param: [EndpointMap, {get_param: EndpointName }, port] }
+            - {get_param: UriSuffix }
+      uri_no_suffix:
+        list_join:
+          - ''
+          - - {get_param: [EndpointMap, {get_param: EndpointName }, protocol] }
+            - '://'
+            - str_replace:
+                template: {get_param: [EndpointMap, {get_param: EndpointName }, host]}
+                params: {IP_ADDRESS: {get_param: IP} }
+            - ':'
+            - {get_param: [EndpointMap, {get_param: EndpointName }, port] }
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
new file mode 100644
index 00000000..9c000c38
--- /dev/null
+++ b/network/endpoints/endpoint_map.yaml
@@ -0,0 +1,374 @@
+heat_template_version: 2015-04-30
+
+description: >
+  A Map of OpenStack Endpoints
+
+parameters:
+  CeilometerApiVirtualIP:
+    type: string
+    default: ''
+  CinderApiVirtualIP:
+    type: string
+    default: ''
+  GlanceApiVirtualIP:
+    type: string
+    default: ''
+  GlanceRegistryVirtualIP:
+    type: string
+    default: ''
+  HeatApiVirtualIP:
+    type: string
+    default: ''
+  KeystoneAdminApiVirtualIP:
+    type: string
+    default: ''
+  KeystonePublicApiVirtualIP:
+    type: string
+    default: ''
+  MysqlVirtualIP:
+    type: string
+    default: ''
+  NeutronApiVirtualIP:
+    type: string
+    default: ''
+  NovaApiVirtualIP:
+    type: string
+    default: ''
+  PublicVirtualIP:
+    type: string
+    default: ''
+  SwiftProxyVirtualIP:
+    type: string
+    default: ''
+  EndpointMap:
+    type: json
+    default:
+      CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
+      CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
+      CeilometerPublic: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
+      CinderAdmin: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
+      CinderInternal: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
+      CinderPublic: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
+      GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
+      GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
+      GlancePublic: {protocol: 'http', port: '9292', 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'}
+      KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
+      KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
+      KeystonePublic: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
+      NeutronAdmin: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
+      NeutronInternal: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
+      NeutronPublic: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
+      NovaAdmin: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
+      NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
+      NovaPublic: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
+      NovaEC2Admin: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
+      NovaEC2Internal: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
+      NovaEC2Public: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
+      SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
+      SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
+      SwiftPublic: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+
+resources:
+
+  CeilometerInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CeilometerInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: CeilometerApiVirtualIP}
+  CeilometerPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CeilometerPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+  CeilometerAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CeilometerAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: CeilometerApiVirtualIP}
+
+  CinderInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CinderInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: CinderApiVirtualIP}
+      UriSuffix: '/v1/%(tenant_id)s'
+  CinderPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CinderPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v1/%(tenant_id)s'
+  CinderAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CinderAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: CinderApiVirtualIP}
+      UriSuffix: '/v1/%(tenant_id)s'
+
+  CinderV2Internal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CinderInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: CinderApiVirtualIP}
+      UriSuffix: '/v2/%(tenant_id)s'
+  CinderV2Public:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CinderPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v2/%(tenant_id)s'
+  CinderV2Admin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: CinderAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: CinderApiVirtualIP}
+      UriSuffix: '/v2/%(tenant_id)s'
+
+  GlanceInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: GlanceInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: GlanceApiVirtualIP}
+  GlancePublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: GlancePublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+  GlanceAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: GlanceAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: GlanceApiVirtualIP}
+
+  HeatInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: HeatInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: HeatApiVirtualIP}
+      UriSuffix: '/v1/%(tenant_id)s'
+  HeatPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: HeatPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v1/%(tenant_id)s'
+  HeatAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: HeatAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: HeatApiVirtualIP}
+      UriSuffix: '/v1/%(tenant_id)s'
+
+  KeystoneInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: KeystoneInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: KeystonePublicApiVirtualIP}
+      UriSuffix: '/v2.0'
+  KeystonePublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: KeystonePublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v2.0'
+  KeystoneAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: KeystoneAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: KeystoneAdminApiVirtualIP}
+      UriSuffix: '/v2.0'
+  KeystoneEC2:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: KeystoneInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: KeystonePublicApiVirtualIP}
+      UriSuffix: '/v2.0/ec2tokens'
+
+  NeutronInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NeutronInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NeutronApiVirtualIP}
+  NeutronPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NeutronPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+  NeutronAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NeutronAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NeutronApiVirtualIP}
+
+  NovaInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NovaApiVirtualIP}
+      UriSuffix: '/v2/%(tenant_id)s'
+  NovaPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v2/%(tenant_id)s'
+  NovaAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NovaApiVirtualIP}
+      UriSuffix: '/v2/%(tenant_id)s'
+  NovaV3Internal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NovaApiVirtualIP}
+      UriSuffix: '/v3'
+  NovaV3Public:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v3'
+  NovaV3Admin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NovaApiVirtualIP}
+      UriSuffix: '/v3'
+
+  NovaEC2Internal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaEC2Internal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NovaApiVirtualIP}
+      UriSuffix: '/services/Cloud'
+  NovaEC2Public:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaEC2Public
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/services/Cloud'
+  NovaEC2Admin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: NovaEC2Admin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: NovaApiVirtualIP}
+      UriSuffix: '/services/Admin'
+
+  SwiftInternal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: SwiftInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: SwiftProxyVirtualIP}
+      UriSuffix: '/v1/AUTH_%(tenant_id)s'
+  SwiftPublic:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: SwiftPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+      UriSuffix: '/v1/AUTH_%(tenant_id)s'
+  SwiftAdmin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: SwiftAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: SwiftProxyVirtualIP}
+      # No Suffix for the Admin interface
+  SwiftS3Internal:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: SwiftInternal
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: SwiftProxyVirtualIP}
+  SwiftS3Public:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: SwiftPublic
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: PublicVirtualIP}
+  SwiftS3Admin:
+    type: OS::TripleO::Endpoint
+    properties:
+      EndpointName: SwiftAdmin
+      EndpointMap: { get_param: EndpointMap }
+      IP: {get_param: SwiftProxyVirtualIP}
+
+outputs:
+  endpoint_map:
+    value:
+      CeilometerInternal: {get_attr: [ CeilometerInternal, endpoint] }
+      CeilometerPublic: {get_attr: [ CeilometerPublic, endpoint] }
+      CeilometerAdmin: {get_attr: [ CeilometerAdmin, endpoint] }
+      CinderInternal: {get_attr: [ CinderInternal, endpoint] }
+      CinderPublic: {get_attr: [ CinderPublic, endpoint] }
+      CinderAdmin: {get_attr: [ CinderAdmin, endpoint] }
+      CinderV2Internal: {get_attr: [ CinderV2Internal, endpoint] }
+      CinderV2Public: {get_attr: [ CinderV2Public, endpoint] }
+      CinderV2Admin: {get_attr: [ CinderV2Admin, endpoint] }
+      GlanceInternal: {get_attr: [ GlanceInternal, endpoint] }
+      GlancePublic: {get_attr: [ GlancePublic, endpoint] }
+      GlanceAdmin: {get_attr: [ GlanceAdmin, endpoint] }
+      HeatInternal: {get_attr: [ HeatInternal, endpoint] }
+      HeatPublic: {get_attr: [ HeatPublic, endpoint] }
+      HeatAdmin: {get_attr: [ HeatAdmin, endpoint] }
+      KeystoneInternal: {get_attr: [ KeystoneInternal, endpoint] }
+      KeystonePublic: {get_attr: [ KeystonePublic, endpoint] }
+      KeystoneAdmin: {get_attr: [ KeystoneAdmin, endpoint] }
+      KeystoneEC2: {get_attr: [ KeystoneEC2, endpoint] }
+      NeutronInternal: {get_attr: [ NeutronInternal, endpoint] }
+      NeutronPublic: {get_attr: [ NeutronPublic, endpoint] }
+      NeutronAdmin: {get_attr: [ NeutronAdmin, endpoint] }
+      NovaInternal: {get_attr: [ NovaInternal, endpoint] }
+      NovaPublic: {get_attr: [ NovaPublic, endpoint] }
+      NovaAdmin: {get_attr: [ NovaAdmin, endpoint] }
+      NovaV3Internal: {get_attr: [ NovaV3Internal, endpoint] }
+      NovaV3Public: {get_attr: [ NovaV3Public, endpoint] }
+      NovaV3Admin: {get_attr: [ NovaV3Admin, endpoint] }
+      NovaEC2Internal: {get_attr: [ NovaEC2Internal, endpoint] }
+      NovaEC2Public: {get_attr: [ NovaEC2Public, endpoint] }
+      NovaEC2Admin: {get_attr: [ NovaEC2Admin, endpoint] }
+      SwiftInternal: {get_attr: [ SwiftInternal, endpoint] }
+      SwiftPublic: {get_attr: [ SwiftPublic, endpoint] }
+      SwiftAdmin: {get_attr: [ SwiftAdmin, endpoint] }
+      SwiftS3Internal: {get_attr: [ SwiftS3Internal, endpoint] }
+      SwiftS3Public: {get_attr: [ SwiftS3Public, endpoint] }
+      SwiftS3Admin: {get_attr: [ SwiftS3Admin, endpoint] }