openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove EC2 endpoint from EndpointMap 

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

Change-Id: Idab78d61f3931818aa91faad2d68c1fe20f68db6
This commit is contained in:
Juan Antonio Osorio Robles 2017-03-31 14:15:02 +03:00
parent ffc3ea0f55
commit 5b4b7838e7
2 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
network/endpoints/endpoint_data.yaml
View File

@ -225,7 +225,6 @@ Keystone:
net_param: KeystonePublicApi
uri_suffixes:
'': /v2.0
EC2: /v2.0/ec2tokens
V3: /v3
names:
EC2: KeystoneEC2

82
network/endpoints/endpoint_map.yaml
View File

@ -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: