openstack/tripleo-heat-templates
Code Issues Proposed changes

Make KeystoneURL versionless

Browse Source 
Now that Keystone v2 has been removed, we can update this to a versionless
path. This output is used by tripleo-common to populate the overcloudrc file.

Closes-Bug: #1727454
Change-Id: I482f77443ed6255fb9f1b67241dd6260be574e7f
This commit is contained in:
Dougal Matthews 2017-10-26 11:09:35 +01:00
parent 9bd858ebdf
commit 50a67e1b4b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/endpoints/endpoint_data.yaml
View File

@ -143,19 +143,19 @@ Keystone:
Internal:
net_param: KeystonePublicApi
uri_suffixes:
'': /v2.0
'': /
V3: /v3
names:
EC2: KeystoneEC2
Public:
net_param: Public
uri_suffixes:
'': /v2.0
'': /
V3: /v3
Admin:
net_param: KeystoneAdminApi
uri_suffixes:
'': /v2.0
'': /
V3: /v3
port: 35357
port: 5000

6
network/endpoints/endpoint_map.yaml
View File

@ -3954,7 +3954,7 @@ outputs:
template: NETWORK_uri
port:
get_param: [EndpointMap, KeystoneAdmin, port]
path: /v2.0
path: /
uri_no_suffix:
make_url:
scheme:
@ -4036,7 +4036,7 @@ outputs:
template: NETWORK_uri
port:
get_param: [EndpointMap, KeystoneInternal, port]
path: /v2.0
path: /
uri_no_suffix:
make_url:
scheme:
@ -4118,7 +4118,7 @@ outputs:
template: NETWORK_uri
port:
get_param: [EndpointMap, KeystonePublic, port]
path: /v2.0
path: /
uri_no_suffix:
make_url:
scheme: