From e3cf221066f5a9aa9f760e396353cd6686075730 Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Thu, 20 May 2021 09:45:41 -0400
Subject: [PATCH] Use Block Storage API v3

The openstackclient has defaulted to using the v3 API since 4.0.0 [0],
so there is no reason for grenade to insist on using v2, especially since
v2 is being removed in Xena [1].

[0] https://opendev.org/openstack/python-openstackclient/commit/a96089ff6d54237a9e058dc1c7e6fc7e25695ecb
[1] https://review.opendev.org/c/openstack/cinder/+/792299

Change-Id: Ie558d45374f92f79942b80a9c27fd393ad4f4761
---
 projects/70_cinder/resources.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/70_cinder/resources.sh b/projects/70_cinder/resources.sh
index 0308db45..ef2ecd4f 100755
--- a/projects/70_cinder/resources.sh
+++ b/projects/70_cinder/resources.sh
@@ -42,8 +42,8 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.2-x86_64-uec}
 
 export OS_IMAGE_API_VERSION=2
 
-# BUG openstack client doesn't work with cinder v3
-export OS_VOLUME_API_VERSION=2
+# Block Storage API v2 was deprecated in Pike and removed in Xena
+export OS_VOLUME_API_VERSION=3
 
 if ! is_service_enabled c-api; then
     echo "Cinder is not enabled. Skipping resource phase $1 for cinder."