rbd/thrash: factor out install + ceph

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

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

diff --git a/suites/rbd/thrash/thrashers/cache.yaml b/suites/rbd/thrash/thrashers/cache.yaml
index 38ba92ab5ee076403265cc3dbd012f1e7dd25ab1..5bab78ee8406f10c5a0501c3ba0a681f2c1bd2c6 100644 (file)
--- a/suites/rbd/thrash/thrashers/cache.yaml
+++ b/suites/rbd/thrash/thrashers/cache.yaml
@@ -1,9 +1,9 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
+tasks:
 - exec:
     client.0:
       - ceph osd pool create cache 4

diff --git a/suites/rbd/thrash/thrashers/default.yaml b/suites/rbd/thrash/thrashers/default.yaml
index 14d7f17c20f2ba2ed6ccada40fb358e6c5687542..89c9bdfb0e58adc9d97169b01e25eaacf7be7b03 100644 (file)
--- a/suites/rbd/thrash/thrashers/default.yaml
+++ b/suites/rbd/thrash/thrashers/default.yaml
@@ -1,8 +1,8 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
+tasks:
 - thrashosds:
     timeout: 1200