15 files changed, 17 insertions, 26 deletions

diff --git a/qa/suites/rados/basic/ceph.yaml b/qa/suites/rados/basic/ceph.yaml
new file mode 100644
index 00000000000..2030acb9083
--- /dev/null
+++ b/qa/suites/rados/basic/ceph.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:
diff --git a/qa/suites/rados/basic/d-require-luminous b/qa/suites/rados/basic/d-require-luminous
new file mode 120000
index 00000000000..737aee82415
--- /dev/null
+++ b/qa/suites/rados/basic/d-require-luminous
@@ -0,0 +1 @@
+../thrash/d-require-luminous/
\ No newline at end of file
diff --git a/qa/suites/rados/basic/tasks/rados_api_tests.yaml b/qa/suites/rados/basic/tasks/rados_api_tests.yaml
index acfc597dec3..b66423988d7 100644
--- a/qa/suites/rados/basic/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/basic/tasks/rados_api_tests.yaml
@@ -4,8 +4,6 @@ overrides:
     - reached quota
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:
diff --git a/qa/suites/rados/basic/tasks/rados_cls_all.yaml b/qa/suites/rados/basic/tasks/rados_cls_all.yaml
index 34f7cbbb4a0..bbab083e9cd 100644
--- a/qa/suites/rados/basic/tasks/rados_cls_all.yaml
+++ b/qa/suites/rados/basic/tasks/rados_cls_all.yaml
@@ -1,6 +1,12 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd_class_load_list: "cephfs hello journal lock log numops rbd refcount 
+                              replica_log rgw sdk statelog timeindex user version"
+        osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
+                                 replica_log rgw sdk statelog timeindex user version"
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:
diff --git a/qa/suites/rados/basic/tasks/rados_python.yaml b/qa/suites/rados/basic/tasks/rados_python.yaml
index 00320538ff7..d8b332b343d 100644
--- a/qa/suites/rados/basic/tasks/rados_python.yaml
+++ b/qa/suites/rados/basic/tasks/rados_python.yaml
@@ -1,8 +1,8 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
+tasks:
 - workunit:
     clients:
       client.0:
diff --git a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
index ae2e5fd0083..0e1ba010c5b 100644
--- a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
+++ b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:
diff --git a/qa/suites/rados/basic/tasks/rados_striper.yaml b/qa/suites/rados/basic/tasks/rados_striper.yaml
index 8537fcbd4db..c19cc83a93b 100644
--- a/qa/suites/rados/basic/tasks/rados_striper.yaml
+++ b/qa/suites/rados/basic/tasks/rados_striper.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - exec:
    client.0:
    - ceph_test_rados_striper_api_io
diff --git a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
index 9432367e356..fa928d12063 100644
--- a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
+++ b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
@@ -3,8 +3,6 @@ overrides:
     log-whitelist:
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       all:
diff --git a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
index 7d882cac9c9..35d8fdaf11f 100644
--- a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
+++ b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
@@ -3,8 +3,6 @@ overrides:
     log-whitelist:
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       all:
diff --git a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
index 69c06b7b049..b3af2a2cac3 100644
--- a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
+++ b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
@@ -3,8 +3,6 @@ overrides:
     log-whitelist:
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       all:
diff --git a/qa/suites/rados/basic/tasks/readwrite.yaml b/qa/suites/rados/basic/tasks/readwrite.yaml
index 38343f316eb..f135107c767 100644
--- a/qa/suites/rados/basic/tasks/readwrite.yaml
+++ b/qa/suites/rados/basic/tasks/readwrite.yaml
@@ -2,11 +2,11 @@ overrides:
   ceph:
     crush_tunables: optimal
     conf:
+      mon:
+        mon osd initial require min compat client: luminous
       osd:
         osd_discard_disconnected_ops: false
 tasks:
-- install:
-- ceph:
 - rados:
     clients: [client.0]
     ops: 4000
diff --git a/qa/suites/rados/basic/tasks/repair_test.yaml b/qa/suites/rados/basic/tasks/repair_test.yaml
index 609f0db6211..bd98522d1e0 100644
--- a/qa/suites/rados/basic/tasks/repair_test.yaml
+++ b/qa/suites/rados/basic/tasks/repair_test.yaml
@@ -21,7 +21,5 @@ overrides:
         filestore debug inject read err: true
         bluestore debug inject read err: true
 tasks:
-- install:
-- ceph:
 - repair_test:
 
diff --git a/qa/suites/rados/basic/tasks/rgw_snaps.yaml b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
index 3e7745aec2a..135db06b8ea 100644
--- a/qa/suites/rados/basic/tasks/rgw_snaps.yaml
+++ b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
@@ -7,8 +7,6 @@ overrides:
       osd:
         osd_max_omap_entries_per_request: 10
 tasks:
-- install:
-- ceph:
 - rgw:
     default_idle_timeout: 3600
     client.0: null
diff --git a/qa/suites/rados/basic/tasks/scrub_test.yaml b/qa/suites/rados/basic/tasks/scrub_test.yaml
index 3b3b69dfad3..1847f80d46b 100644
--- a/qa/suites/rados/basic/tasks/scrub_test.yaml
+++ b/qa/suites/rados/basic/tasks/scrub_test.yaml
@@ -18,6 +18,4 @@ overrides:
       osd:
         osd deep scrub update digest min age: 0
 tasks:
-- install:
-- ceph:
 - scrub_test:
diff --git a/qa/suites/rados/basic/z-require-luminous b/qa/suites/rados/basic/z-require-luminous
deleted file mode 120000
index 483b23de56b..00000000000
--- a/qa/suites/rados/basic/z-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/z-require-luminous
\ No newline at end of file