From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 4 Feb 2021 14:00:23 +0000 (-0500)
Subject: qa/suites/rbd: drop require-osd-release command
X-Git-Tag: v17.1.0~3054^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e14f90eea788d1b17f3cbd108f4ff90de60a5078;p=ceph.git

qa/suites/rbd: drop require-osd-release command

Teuthology already defaults to quincy now and results in a failure
when trying to set to pacific. Additionally, drop the LUKS readbalance
test since it's unnecessary to duplicate that test.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/suites/rbd/encryption/features/readbalance.yaml b/qa/suites/rbd/encryption/features/readbalance.yaml
deleted file mode 100644
index 53b11d742d13b..0000000000000
--- a/qa/suites/rbd/encryption/features/readbalance.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd read from replica policy: balance
-
-tasks:
-- exec:
-    osd.0:
-      - ceph osd require-osd-release pacific
-      - ceph osd set-require-min-compat-client octopus
diff --git a/qa/suites/rbd/qemu/features/readbalance.yaml b/qa/suites/rbd/qemu/features/readbalance.yaml
index 53b11d742d13b..e3812f4c7f77c 100644
--- a/qa/suites/rbd/qemu/features/readbalance.yaml
+++ b/qa/suites/rbd/qemu/features/readbalance.yaml
@@ -7,5 +7,4 @@ overrides:
 tasks:
 - exec:
     osd.0:
-      - ceph osd require-osd-release pacific
       - ceph osd set-require-min-compat-client octopus