openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Deploy Sahara with unversioned endpoints"

This commit is contained in:
Zuul 2019-03-12 13:46:14 +00:00 committed by Gerrit Code Review
parent c59bf8ce13 bb4f86fc00
commit 458080d44d
2 changed files with 66 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/endpoints/endpoint_data.yaml
View File

@ -323,16 +323,10 @@ CephRgw:
Sahara:
Internal:
net_param: SaharaApi
uri_suffixes:
'': /v1.1/%(tenant_id)s
Public:
net_param: Public
uri_suffixes:
'': /v1.1/%(tenant_id)s
Admin:
net_param: SaharaApi
uri_suffixes:
'': /v1.1/%(tenant_id)s
port: 8386
Tacker:

144
network/endpoints/endpoint_map.yaml
View File

@ -7887,32 +7887,28 @@ outputs:
protocol:
get_param: [EndpointMap, SaharaAdmin, protocol]
uri:
list_join:
- ''
- - make_url:
scheme:
get_param: [EndpointMap, SaharaAdmin, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, SaharaAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, SaharaApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, SaharaApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, SaharaAdmin, port]
path: /v1.1/
- '%(tenant_id)s'
make_url:
scheme:
get_param: [EndpointMap, SaharaAdmin, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, SaharaAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, SaharaApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, SaharaApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, SaharaAdmin, port]
uri_no_suffix:
make_url:
scheme:
@ -7972,32 +7968,28 @@ outputs:
protocol:
get_param: [EndpointMap, SaharaInternal, protocol]
uri:
list_join:
- ''
- - make_url:
scheme:
get_param: [EndpointMap, SaharaInternal, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, SaharaInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, SaharaApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, SaharaApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, SaharaInternal, port]
path: /v1.1/
- '%(tenant_id)s'
make_url:
scheme:
get_param: [EndpointMap, SaharaInternal, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, SaharaInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, SaharaApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, SaharaApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, SaharaInternal, port]
uri_no_suffix:
make_url:
scheme:
@ -8057,32 +8049,28 @@ outputs:
protocol:
get_param: [EndpointMap, SaharaPublic, protocol]
uri:
list_join:
- ''
- - make_url:
scheme:
get_param: [EndpointMap, SaharaPublic, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, SaharaPublic, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, PublicNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, PublicNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, SaharaPublic, port]
path: /v1.1/
- '%(tenant_id)s'
make_url:
scheme:
get_param: [EndpointMap, SaharaPublic, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, SaharaPublic, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, PublicNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, PublicNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, SaharaPublic, port]
uri_no_suffix:
make_url:
scheme: