aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-25 13:34:03 +0000
committerGerrit Code Review <review@openstack.org>2016-07-25 13:34:03 +0000
commit11a27c9a3b4e0969f3a89c2a9485f72317577c12 (patch)
tree3384f2596026fd7001006b9129ca42d8bf11f77e
parentf00ed98048a1a24e55dfea64171771ff73216335 (diff)
parent6c2dea469c2ad197f766a614eea25c24f92cbae0 (diff)
Merge "Remove tenant_id from nova v2.1 endpoint"
-rw-r--r--network/endpoints/endpoint_data.yaml6
-rw-r--r--network/endpoints/endpoint_map.yaml6
2 files changed, 6 insertions, 6 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index f1dee045..5afcf5de 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -146,15 +146,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
NovaVNCProxy:
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index 43b9921e..e1b8984f 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -1688,7 +1688,7 @@ outputs:
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaAdmin, port]
- - /v2.1/%(tenant_id)s
+ - /v2.1
uri_no_suffix:
list_join:
- ''
@@ -1727,7 +1727,7 @@ outputs:
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaInternal, port]
- - /v2.1/%(tenant_id)s
+ - /v2.1
uri_no_suffix:
list_join:
- ''
@@ -1766,7 +1766,7 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
- - /v2.1/%(tenant_id)s
+ - /v2.1
uri_no_suffix:
list_join:
- ''