diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2016-05-16 13:07:46 -0500 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2016-05-16 13:07:46 -0500 |
| commit | 6c2dea469c2ad197f766a614eea25c24f92cbae0 (patch) | |
| tree | 4d85c5d1f18b8fcf29638bede8d07254ce03a0cf | |
| parent | 30c8663b9f3360e5c83413cf2b7487e99b805950 (diff) | |
Remove tenant_id from nova v2.1 endpoint
Per the nova devs on [1], this is not necessary.
Change-Id: I11974432c995b22b3c98ef9ae2adc3508d9cc536
1: https://review.openstack.org/#/c/316241/1/manifests/keystone/auth.pp
| -rw-r--r-- | network/endpoints/endpoint_data.yaml | 6 | ||||
| -rw-r--r-- | network/endpoints/endpoint_map.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index f88a68f4..21e604ae 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -123,15 +123,15 @@ Nova: Internal: vip_param: NovaApi uri_suffixes: - '': /v2.1/%(tenant_id)s + '': /v2.1 Public: vip_param: Public uri_suffixes: - '': /v2.1/%(tenant_id)s + '': /v2.1 Admin: vip_param: NovaApi uri_suffixes: - '': /v2.1/%(tenant_id)s + '': /v2.1 port: 8774 NovaEC2: diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 1bd35a7c..7d084947 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -1370,7 +1370,7 @@ outputs: IP_ADDRESS: {get_param: NovaApiVirtualIP} - ':' - get_param: [EndpointMap, NovaAdmin, port] - - /v2.1/%(tenant_id)s + - /v2.1 uri_no_suffix: list_join: - '' @@ -1409,7 +1409,7 @@ outputs: IP_ADDRESS: {get_param: NovaApiVirtualIP} - ':' - get_param: [EndpointMap, NovaInternal, port] - - /v2.1/%(tenant_id)s + - /v2.1 uri_no_suffix: list_join: - '' @@ -1448,7 +1448,7 @@ outputs: IP_ADDRESS: {get_param: PublicVirtualIP} - ':' - get_param: [EndpointMap, NovaPublic, port] - - /v2.1/%(tenant_id)s + - /v2.1 uri_no_suffix: list_join: - '' |