From 09c369514d7696fc0c67db8f75cbca482294ff58 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Wed, 15 Aug 2018 10:57:55 +0000
Subject: [PATCH] Remove deprecated volume API config options

Started by Rocky release
 * ``CONF.volume-feature-enabled.api_v2``
 * ``CONF.volume-feature-enabled.api_v3``
are deprecated and have no effect.
``CONF.volume.catalog_type`` will be used instead.

Volume APIs tests have been moved to v3 as default and can be run
under v2 API via catalog_type.
- https://review.opendev.org/#/q/topic:volume-default-testing-v3+(status:open+OR+status:merged)

Story: 2007283
Task: 38735

Change-Id: Ia4c07bdda484828a29e9bfa299134f69d0f4050a
---
 config_tempest/services/volume.py             |  3 ---
 ...olume-config-options-a7b30be51c77ac7b.yaml | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-volume-config-options-a7b30be51c77ac7b.yaml

diff --git a/config_tempest/services/volume.py b/config_tempest/services/volume.py
index b61c34b8..f429784c 100644
--- a/config_tempest/services/volume.py
+++ b/config_tempest/services/volume.py
@@ -63,9 +63,6 @@ class VolumeService(VersionedService):
     def get_service_extension_key(self):
         return 'api_extensions'
 
-    def get_supported_versions(self):
-        return ['v2', 'v3']
-
     @staticmethod
     def get_codename():
         return 'cinder'
diff --git a/releasenotes/notes/remove-deprecated-volume-config-options-a7b30be51c77ac7b.yaml b/releasenotes/notes/remove-deprecated-volume-config-options-a7b30be51c77ac7b.yaml
new file mode 100644
index 00000000..95e97638
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-volume-config-options-a7b30be51c77ac7b.yaml
@@ -0,0 +1,19 @@
+---
+upgrade:
+  - |
+    Starting by Rocky the following options are deprecated by Tempest
+
+    * ``CONF.volume-feature-enabled.api_v2``
+    * ``CONF.volume-feature-enabled.api_v3``
+
+    and have no effect on triggering volume v2/v3 API tests.
+    ``CONF.volume.catalog_type`` is used for that instead.
+
+    The options are deleted from Tempest by
+    https://review.opendev.org/c/openstack/tempest/+/698754
+
+    Tempest sets ``CONF.volume.catalog_type`` to 'volumev3' by default so no
+    action in python-tempestconf is needed considering the current API is v3.
+    In case a user wants to run tempest tests against volume v2 API, it's
+    needed to set catalog_type to 'volumev2' e.g. via overrides using
+    python-tempestconf's CLI or manually in the generated tempest.conf file.