Update volume API default version from v1 to v2

Cinder has deprecated API version v1 since Juno release, and
there is a blueprint to remove v1 API support which is in progress.
We should default to v2 API when it's there.

Closes-Bug: 1467589
Change-Id: I83aef4c681cbe342c445f02436fcd40cf1222f23

11 files changed, 21 insertions, 1 deletions

diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst
index d7af6b9..8ae2f61 100644
--- a/doc/source/vendor-support.rst
+++ b/doc/source/vendor-support.rst
@@ -16,6 +16,7 @@ These are the default behaviors unless a cloud is configured differently.
 * Identity uses `password` authentication
 * Identity API Version is 2
 * Image API Version is 2
+* Volume API Version is 2
 * Images must be in `qcow2` format
 * Images are uploaded using PUT interface
 * Public IPv4 is directly routable via DHCP from Neutron
@@ -51,6 +52,7 @@ nz_wlg_2       Wellington, NZ
 
 * Image API Version is 1
 * Images must be in `raw` format
+* Volume API Version is 1
 
 citycloud
 ---------
@@ -67,6 +69,7 @@ Kna1           Karlskrona, SE
 
 * Identity API Version is 3
 * Public IPv4 is provided via NAT with Neutron Floating IP
+* Volume API Version is 1
 
 conoha
 ------
@@ -137,6 +140,8 @@ it-mil1        Milan, IT
 de-fra1        Frankfurt, DE
 ============== ================
 
+* Volume API Version is 1
+
 hp
 --
 
@@ -152,6 +157,7 @@ region-b.geo-1 US East
 * DNS Service Type is `hpext:dns`
 * Image API Version is 1
 * Public IPv4 is provided via NAT with Neutron Floating IP
+* Volume API Version is 1
 
 internap
 --------
@@ -212,6 +218,7 @@ SYD            Sydney
 * Uploaded Images need properties to not use vendor agent::
   :vm_mode: hvm
   :xenapi_use_agent: False
+* Volume API Version is 1
 
 runabove
 --------
@@ -241,6 +248,7 @@ ZH             Zurich, CH
 
 * Images must be in `raw` format
 * Images must be uploaded using the Glance Task Interface
+* Volume API Version is 1
 
 ultimum
 -------
@@ -253,6 +261,8 @@ Region Name    Human Name
 RegionOne      Region One
 ============== ================
 
+* Volume API Version is 1
+
 unitedstack
 -----------
 
@@ -267,6 +277,7 @@ gd1            Guangdong
 
 * Identity API Version is 3
 * Images must be in `raw` format
+* Volume API Version is 1
 
 vexxhost
 --------
diff --git a/os_client_config/defaults.json b/os_client_config/defaults.json
index 6735b55..2ffb672 100644
--- a/os_client_config/defaults.json
+++ b/os_client_config/defaults.json
@@ -17,5 +17,5 @@
   "object_store_api_version": "1",
   "orchestration_api_version": "1",
   "secgroup_source": "neutron",
-  "volume_api_version": "1"
+  "volume_api_version": "2"
 }
diff --git a/os_client_config/vendors/bluebox.json b/os_client_config/vendors/bluebox.json
index 2227aac..647c842 100644
--- a/os_client_config/vendors/bluebox.json
+++ b/os_client_config/vendors/bluebox.json
@@ -1,6 +1,7 @@
 {
   "name": "bluebox",
   "profile": {
+    "volume_api_version": "1",
     "region_name": "RegionOne"
   }
 }
diff --git a/os_client_config/vendors/catalyst.json b/os_client_config/vendors/catalyst.json
index ddde838..3ad7507 100644
--- a/os_client_config/vendors/catalyst.json
+++ b/os_client_config/vendors/catalyst.json
@@ -9,6 +9,7 @@
       "nz_wlg_2"
     ],
     "image_api_version": "1",
+    "volume_api_version": "1",
     "image_format": "raw"
   }
 }
diff --git a/os_client_config/vendors/citycloud.json b/os_client_config/vendors/citycloud.json
index f6c57c7..64cadce 100644
--- a/os_client_config/vendors/citycloud.json
+++ b/os_client_config/vendors/citycloud.json
@@ -9,6 +9,7 @@
       "Sto2",
       "Kna1"
     ],
+    "volume_api_version": "1",
     "identity_api_version": "3"
   }
 }
diff --git a/os_client_config/vendors/entercloudsuite.json b/os_client_config/vendors/entercloudsuite.json
index 826c25f..5a425b4 100644
--- a/os_client_config/vendors/entercloudsuite.json
+++ b/os_client_config/vendors/entercloudsuite.json
@@ -4,6 +4,7 @@
     "auth": {
       "auth_url": "https://api.entercloudsuite.com/v2.0"
     },
+    "volume_api_version": "1",
     "regions": [
       "it-mil1",
       "nl-ams1",
diff --git a/os_client_config/vendors/hp.json b/os_client_config/vendors/hp.json
index 10789a9..ac280f2 100644
--- a/os_client_config/vendors/hp.json
+++ b/os_client_config/vendors/hp.json
@@ -9,6 +9,7 @@
       "region-b.geo-1"
     ],
     "dns_service_type": "hpext:dns",
+    "volume_api_version": "1",
     "image_api_version": "1"
   }
 }
diff --git a/os_client_config/vendors/rackspace.json b/os_client_config/vendors/rackspace.json
index 582e122..3fbbacd 100644
--- a/os_client_config/vendors/rackspace.json
+++ b/os_client_config/vendors/rackspace.json
@@ -18,6 +18,7 @@
     "image_format": "vhd",
     "floating_ip_source": "None",
     "secgroup_source": "None",
+    "volume_api_version": "1",
     "disable_vendor_agent": {
       "vm_mode": "hvm",
       "xenapi_use_agent": false
diff --git a/os_client_config/vendors/switchengines.json b/os_client_config/vendors/switchengines.json
index 8a7c566..46f6325 100644
--- a/os_client_config/vendors/switchengines.json
+++ b/os_client_config/vendors/switchengines.json
@@ -8,6 +8,7 @@
       "LS",
       "ZH"
     ],
+    "volume_api_version": "1",
     "image_api_use_tasks": true,
     "image_format": "raw"
   }
diff --git a/os_client_config/vendors/ultimum.json b/os_client_config/vendors/ultimum.json
index ada6e3d..0b38d71 100644
--- a/os_client_config/vendors/ultimum.json
+++ b/os_client_config/vendors/ultimum.json
@@ -4,6 +4,7 @@
     "auth": {
       "auth_url": "https://console.ultimum-cloud.com:5000/v2.0"
     },
+    "volume_api_version": "1",
     "region-name": "RegionOne"
   }
 }
diff --git a/os_client_config/vendors/unitedstack.json b/os_client_config/vendors/unitedstack.json
index 41f4585..ac8be11 100644
--- a/os_client_config/vendors/unitedstack.json
+++ b/os_client_config/vendors/unitedstack.json
@@ -8,6 +8,7 @@
       "bj1",
       "gd1"
     ],
+    "volume_api_version": "1",
     "identity_api_version": "3",
     "image_format": "raw",
     "floating_ip_source": "None"