qa/suites/rados/verify: refactor thrash and cluster create

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/verify/1thrash/default.yaml b/qa/suites/rados/verify/1thrash/default.yaml
deleted file mode 100644 (file)
index 9435b14..0000000
--- a/qa/suites/rados/verify/1thrash/default.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/verify/1thrash/none.yaml b/qa/suites/rados/verify/1thrash/none.yaml
deleted file mode 100644 (file)
index 2030acb..0000000
--- a/qa/suites/rados/verify/1thrash/none.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:

diff --git a/qa/suites/rados/verify/ceph-thrash/default.yaml b/qa/suites/rados/verify/ceph-thrash/default.yaml
new file mode 100644 (file)
index 0000000..d67ff20
--- /dev/null
+++ b/qa/suites/rados/verify/ceph-thrash/default.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/verify/ceph-thrash/none.yaml b/qa/suites/rados/verify/ceph-thrash/none.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/verify/ceph.yaml b/qa/suites/rados/verify/ceph.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/qa/suites/rados/verify/ceph.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph: