Merge "Remove unused user resource."

[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 e9f97fa..8f0f587 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -3,12 +3,14 @@
 ### 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:
   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: ''}
@@ -30,9 +32,6 @@ 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}
@@ -530,120 +529,6 @@ outputs:
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, GlancePublic, port]
-      GlanceRegistryAdmin:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, GlanceRegistryAdmin, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
-        port:
-          get_param: [EndpointMap, GlanceRegistryAdmin, port]
-        protocol:
-          get_param: [EndpointMap, GlanceRegistryAdmin, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, GlanceRegistryAdmin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, GlanceRegistryAdmin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, GlanceRegistryAdmin, port]
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, GlanceRegistryAdmin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, GlanceRegistryAdmin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, GlanceRegistryAdmin, port]
-      GlanceRegistryInternal:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, GlanceRegistryInternal, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
-        port:
-          get_param: [EndpointMap, GlanceRegistryInternal, port]
-        protocol:
-          get_param: [EndpointMap, GlanceRegistryInternal, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, GlanceRegistryInternal, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, GlanceRegistryInternal, port]
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, GlanceRegistryInternal, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, GlanceRegistryInternal, port]
-      GlanceRegistryPublic:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, GlanceRegistryPublic, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: PublicVirtualIP}
-        port:
-          get_param: [EndpointMap, GlanceRegistryPublic, port]
-        protocol:
-          get_param: [EndpointMap, GlanceRegistryPublic, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, GlanceRegistryPublic, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, GlanceRegistryPublic, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, GlanceRegistryPublic, port]
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, GlanceRegistryPublic, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, GlanceRegistryPublic, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, GlanceRegistryPublic, port]
       HeatAdmin:
         host:
           str_replace:
@@ -1212,7 +1097,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:
           - ''
@@ -1251,7 +1136,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:
           - ''
@@ -1290,7 +1175,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:
           - ''