Merge "Set /64 cidr_netmask for pcmk VIPs when IPv6"

[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 bff7572..a31094a 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -3,9 +3,11 @@
 ### by the script build_endpoint_map.py
 
 heat_template_version: '2015-04-30'
-description: A map of OpenStack endpoints.
+description: A map of OpenStack endpoints. Since the endpoints are URLs,
+  we need to have brackets around IPv6 IP addresses. The inputs to these
+  parameters come from net_ip_uri_map, which will include these brackets
+  in IPv6 addresses.
 parameters:
-  AodhApiVirtualIP: {type: string, default: ''}
   CeilometerApiVirtualIP: {type: string, default: ''}
   CinderApiVirtualIP: {type: string, default: ''}
   GlanceApiVirtualIP: {type: string, default: ''}
@@ -22,9 +24,6 @@ parameters:
   EndpointMap:
     type: json
     default:
-      AodhAdmin: {protocol: http, port: '8042', host: IP_ADDRESS}
-      AodhInternal: {protocol: http, port: '8042', host: IP_ADDRESS}
-      AodhPublic: {protocol: http, port: '8042', host: IP_ADDRESS}
       CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS}
       CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS}
       CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS}
@@ -72,120 +71,6 @@ parameters:
 outputs:
   endpoint_map:
     value:
-      AodhAdmin:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, AodhAdmin, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: AodhApiVirtualIP}
-        port:
-          get_param: [EndpointMap, AodhAdmin, port]
-        protocol:
-          get_param: [EndpointMap, AodhAdmin, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, AodhAdmin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, AodhAdmin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: AodhApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, AodhAdmin, port]
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, AodhAdmin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, AodhAdmin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: AodhApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, AodhAdmin, port]
-      AodhInternal:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, AodhInternal, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: AodhApiVirtualIP}
-        port:
-          get_param: [EndpointMap, AodhInternal, port]
-        protocol:
-          get_param: [EndpointMap, AodhInternal, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, AodhInternal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, AodhInternal, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: AodhApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, AodhInternal, port]
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, AodhInternal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, AodhInternal, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: AodhApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, AodhInternal, port]
-      AodhPublic:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, AodhPublic, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: PublicVirtualIP}
-        port:
-          get_param: [EndpointMap, AodhPublic, port]
-        protocol:
-          get_param: [EndpointMap, AodhPublic, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, AodhPublic, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, AodhPublic, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, AodhPublic, port]
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, AodhPublic, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, AodhPublic, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, AodhPublic, port]
       CeilometerAdmin:
         host:
           str_replace:
@@ -1330,7 +1215,7 @@ outputs:
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaAdmin, port]
-            - /v2/%(tenant_id)s
+            - /v2.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1369,7 +1254,7 @@ outputs:
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaInternal, port]
-            - /v2/%(tenant_id)s
+            - /v2.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1408,7 +1293,7 @@ outputs:
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaPublic, port]
-            - /v2/%(tenant_id)s
+            - /v2.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''