test/scrub: modify selection of max-scrubs configuration values

As the osd-max-scrubs default was increased from 1 to (currently) 3, the
original set of optional values under rados/thrash/3-scrub-overrides are
no longer useful.  This commits changes the set of optional values to
reflect the current default.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/qa/suites/rados/thrash/3-scrub-overrides/default.yaml b/qa/suites/rados/thrash/3-scrub-overrides/default.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml
new file mode 100644 (file)
index 0000000..9a63786
--- /dev/null
+++ b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd max scrubs: 1

diff --git a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml
deleted file mode 100644 (file)
index abf852e..0000000
--- a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd max scrubs: 2

diff --git a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml
new file mode 100644 (file)
index 0000000..bb36e99
--- /dev/null
+++ b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd max scrubs: 5