From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 1 Mar 2016 16:43:24 +0000 (-0500)
Subject: endpoint_map: bump nova api from 2.0 to 2.1
X-Git-Tag: opnfv-6.0.0~2139^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=30a8eb247a168215cdc3870000867af243a123cd;p=apex-tripleo-heat-templates.git

endpoint_map: bump nova api from 2.0 to 2.1

Nova v2.1 allows to use the same API as 2.0 but with microversions
support, which is the recommended way to discover the latest API
version supported in the cloud.

Change-Id: Id011de03d883001fd48dbbcfed53cb821607c7f3
---

diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 9d508d18..7a0bbf4a 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -122,17 +122,17 @@ Nova:
     Internal:
         vip_param: NovaApi
         uri_suffixes:
-            '': /v2/%(tenant_id)s
+            '': /v2.1/%(tenant_id)s
             V3: /v3
     Public:
         vip_param: Public
         uri_suffixes:
-            '': /v2/%(tenant_id)s
+            '': /v2.1/%(tenant_id)s
             V3: /v3
     Admin:
         vip_param: NovaApi
         uri_suffixes:
-            '': /v2/%(tenant_id)s
+            '': /v2.1/%(tenant_id)s
             V3: /v3
     port: 8774
 
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index e9f97fa1..619423d2 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -1212,7 +1212,7 @@ outputs:
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaAdmin, port]
-            - /v2/%(tenant_id)s
+            - /v2.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1251,7 +1251,7 @@ outputs:
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaInternal, port]
-            - /v2/%(tenant_id)s
+            - /v2.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1290,7 +1290,7 @@ outputs:
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaPublic, port]
-            - /v2/%(tenant_id)s
+            - /v2.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''