From a96089ff6d54237a9e058dc1c7e6fc7e25695ecb Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Wed, 14 Aug 2019 14:35:21 -0500
Subject: [PATCH] Default to Cinder v3 API

This switches the default Cinder API version to v3 to prepare for v2
going away.

Change-Id: Icca1512b715409e3001c0fd2d1ea663d5e71ec02
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 openstackclient/volume/client.py                           | 2 +-
 releasenotes/notes/volume-v3-default-0ffa9bebb43b5057.yaml | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/volume-v3-default-0ffa9bebb43b5057.yaml

diff --git a/openstackclient/volume/client.py b/openstackclient/volume/client.py
index e0e670a9ce..fdd1794be5 100644
--- a/openstackclient/volume/client.py
+++ b/openstackclient/volume/client.py
@@ -22,7 +22,7 @@ from openstackclient.i18n import _
 
 LOG = logging.getLogger(__name__)
 
-DEFAULT_API_VERSION = '2'
+DEFAULT_API_VERSION = '3'
 API_VERSION_OPTION = 'os_volume_api_version'
 API_NAME = "volume"
 API_VERSIONS = {
diff --git a/releasenotes/notes/volume-v3-default-0ffa9bebb43b5057.yaml b/releasenotes/notes/volume-v3-default-0ffa9bebb43b5057.yaml
new file mode 100644
index 0000000000..a38a5434d8
--- /dev/null
+++ b/releasenotes/notes/volume-v3-default-0ffa9bebb43b5057.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Volume commands now default to Volume API 3.  On older clouds
+    that do not support Volume 3.x ``--os-volume-api-version 2``
+    of the adition of ``volume_api_version: '2' in ``clouds.yaml``
+    will be required.