commit 475aefc970b273f1d3284d48c58939a31eea2fba
author Zuul <zuul@review.opendev.org> Thu Dec 19 11:41:26 2019 +0000
committer Gerrit Code Review <review@openstack.org> Thu Dec 19 11:41:26 2019 +0000
tree ba5c8b8cc331cea901fbcd1ff1bb61f115225842
parent d661df845dd6d06ffb73a8ddc4a20f47f80d08da
parent 3b663f6e519c290ef0a01e3e4691cb428d2f8ab0

Merge "Remove use of deprecated config options for volume API selection"

ironic_tempest_plugin/manager.py

diff --git a/ironic_tempest_plugin/manager.py b/ironic_tempest_plugin/manager.py
index c3d839d..2977740 100644
--- a/ironic_tempest_plugin/manager.py
+++ b/ironic_tempest_plugin/manager.py
@@ -81,10 +81,8 @@
         cls.security_group_rules_client = (
             cls.os_primary.security_group_rules_client)
 
-        if (CONF.volume_feature_enabled.api_v2 or
-            CONF.volume_feature_enabled.api_v3):
-            cls.volumes_client = cls.os_primary.volumes_client_latest
-            cls.snapshots_client = cls.os_primary.snapshots_client_latest
+        cls.volumes_client = cls.os_primary.volumes_client_latest
+        cls.snapshots_client = cls.os_primary.snapshots_client_latest
 
     # ## Test functions library
     #