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 (file)
index 53b11d7..0000000
--- 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 53b11d742d13b9cd6ce553a9ea93bc4e7779f3a9..e3812f4c7f77c57effbd3e42371b2116e71f446a 100644 (file)
--- 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