Remove EC2 endpoint from EndpointMap

We are removing this in favor of just using the keystone uri and
appending /ec2tokens

Change-Id: Idab78d61f3931818aa91faad2d68c1fe20f68db6

diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 277bd67..c92ce37 100644 (file)
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -225,7 +225,6 @@ Keystone:
         net_param: KeystonePublicApi
         uri_suffixes:
             '': /v2.0
-            EC2: /v2.0/ec2tokens
             V3: /v3
         names:
             EC2: KeystoneEC2

diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index fecac0a..b4fcbb1 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -6012,88 +6012,6 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, KeystoneAdmin, port]
-      KeystoneEC2:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, KeystoneInternal, host]
-            params:
-              CLOUDNAME:
-                get_param:
-                - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-              IP_ADDRESS:
-                get_param:
-                - NetIpMap
-                - str_replace:
-                    params:
-                      NETWORK:
-                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-                    template: NETWORK_uri
-        host_nobrackets:
-          str_replace:
-            template:
-              get_param: [EndpointMap, KeystoneInternal, host]
-            params:
-              CLOUDNAME:
-                get_param:
-                - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-              IP_ADDRESS:
-                get_param:
-                - NetIpMap
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-        port:
-          get_param: [EndpointMap, KeystoneInternal, port]
-        protocol:
-          get_param: [EndpointMap, KeystoneInternal, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-                        template: NETWORK_uri
-            - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v2.0/ec2tokens
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
-                        template: NETWORK_uri
-            - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
       KeystoneInternal:
         host:
           str_replace: