summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2016-03-31 14:31:53 +0200
committerJiri Stransky <jistr@redhat.com>2016-04-01 11:03:17 +0200
commitb239b6216f1fb6791ab717ffe400a463f269c9d8 (patch)
tree7867d299b137fc6d0ae35f4dfad155d253ab2ab4 /network
parentd2710b871b9f0141f0e7150590f896ab1fd71ba7 (diff)
Disable Nova v3 API
Microversions since Nova API v2.1 are aimed to replace the v3 work. The /v2.1 is backwards compatible with the legacy /v2 endpoint. What we called in the past /v3 is now something defunct in-tree. The /v2.1 API is based on the v3 work, but there are many things that differ, in particular with the backwards-compat thing. We keep the /v2 path in api-paste.ini for making sure an upgrade doesn't trample operators and users but if you look in tree, that's redirecting to the v2.1 codepath (just not asking for microversions). In summary, we only need one endpoint, ie. /v2.1. Additional information at https://bugzilla.redhat.com/show_bug.cgi?id=1291291 Related-Bug: #1564372 Change-Id: I1654665663bc5a19c201f7d25407910654ac1308 Depends-On: I6d64b8bcd0f79f1f298ddc809e6d92fbc2985c45
Diffstat (limited to 'network')
-rw-r--r--network/endpoints/endpoint_data.yaml3
-rw-r--r--network/endpoints/endpoint_map.yaml117
2 files changed, 0 insertions, 120 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index a74d75da..edcfaca1 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -123,17 +123,14 @@ Nova:
vip_param: NovaApi
uri_suffixes:
'': /v2.1/%(tenant_id)s
- V3: /v3
Public:
vip_param: Public
uri_suffixes:
'': /v2.1/%(tenant_id)s
- V3: /v3
Admin:
vip_param: NovaApi
uri_suffixes:
'': /v2.1/%(tenant_id)s
- V3: /v3
port: 8774
NovaEC2:
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index 956fb0ba..07266f98 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -1307,123 +1307,6 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
- NovaV3Admin:
- host:
- str_replace:
- template:
- get_param: [EndpointMap, NovaAdmin, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: NovaApiVirtualIP}
- port:
- get_param: [EndpointMap, NovaAdmin, port]
- protocol:
- get_param: [EndpointMap, NovaAdmin, protocol]
- uri:
- list_join:
- - ''
- - - get_param: [EndpointMap, NovaAdmin, protocol]
- - ://
- - str_replace:
- template:
- get_param: [EndpointMap, NovaAdmin, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: NovaApiVirtualIP}
- - ':'
- - get_param: [EndpointMap, NovaAdmin, port]
- - /v3
- uri_no_suffix:
- list_join:
- - ''
- - - get_param: [EndpointMap, NovaAdmin, protocol]
- - ://
- - str_replace:
- template:
- get_param: [EndpointMap, NovaAdmin, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: NovaApiVirtualIP}
- - ':'
- - get_param: [EndpointMap, NovaAdmin, port]
- NovaV3Internal:
- host:
- str_replace:
- template:
- get_param: [EndpointMap, NovaInternal, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: NovaApiVirtualIP}
- port:
- get_param: [EndpointMap, NovaInternal, port]
- protocol:
- get_param: [EndpointMap, NovaInternal, protocol]
- uri:
- list_join:
- - ''
- - - get_param: [EndpointMap, NovaInternal, protocol]
- - ://
- - str_replace:
- template:
- get_param: [EndpointMap, NovaInternal, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: NovaApiVirtualIP}
- - ':'
- - get_param: [EndpointMap, NovaInternal, port]
- - /v3
- uri_no_suffix:
- list_join:
- - ''
- - - get_param: [EndpointMap, NovaInternal, protocol]
- - ://
- - str_replace:
- template:
- get_param: [EndpointMap, NovaInternal, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: NovaApiVirtualIP}
- - ':'
- - get_param: [EndpointMap, NovaInternal, port]
- NovaV3Public:
- host:
- str_replace:
- template:
- get_param: [EndpointMap, NovaPublic, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: PublicVirtualIP}
- port:
- get_param: [EndpointMap, NovaPublic, port]
- protocol:
- get_param: [EndpointMap, NovaPublic, protocol]
- uri:
- list_join:
- - ''
- - - get_param: [EndpointMap, NovaPublic, protocol]
- - ://
- - str_replace:
- template:
- get_param: [EndpointMap, NovaPublic, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: PublicVirtualIP}
- - ':'
- - get_param: [EndpointMap, NovaPublic, port]
- - /v3
- uri_no_suffix:
- list_join:
- - ''
- - - get_param: [EndpointMap, NovaPublic, protocol]
- - ://
- - str_replace:
- template:
- get_param: [EndpointMap, NovaPublic, host]
- params:
- CLOUDNAME: {get_param: CloudName}
- IP_ADDRESS: {get_param: PublicVirtualIP}
- - ':'
- - get_param: [EndpointMap, NovaPublic, port]
NovaEC2Admin:
host:
str_replace: