openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Deploy Sahara with unversioned endpoints 

Sahara supports unversioned endpoint also for the current API v1.1,
and deploying with unversioned endpoints is a better setting
if people want to use both API v1.1 and the (soon-stable) API v2
at the same time.
See https://review.openstack.org/#/c/582285/ for more details.

Closes-Bug: #1782147
Change-Id: Iec6cda460d1e3ed6ec4efa28c52a263876facbc1
This commit is contained in:
Luigi Toscano 2019-01-25 22:48:28 +01:00
parent 52d887eae8
commit bb4f86fc00
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

@ -326,16 +326,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

@ -8051,32 +8051,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:
@ -8136,32 +8132,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:
@ -8221,32 +8213,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: