rados/monthrash: refactor a bit

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

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

diff --git a/suites/rados/monthrash/thrashers/force-sync-many.yaml b/suites/rados/monthrash/thrashers/force-sync-many.yaml
index 3efb5f63d5f9c4e233239b0d92fa4655e8eb996f..2867f2db5ec7c859dc4496e81a24fba640ba5776 100644 (file)
--- a/suites/rados/monthrash/thrashers/force-sync-many.yaml
+++ b/suites/rados/monthrash/thrashers/force-sync-many.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - mon_thrash:
     revive_delay: 90
     thrash_delay: 1

diff --git a/suites/rados/monthrash/thrashers/many.yaml b/suites/rados/monthrash/thrashers/many.yaml
index 565a383a6afecb2e494121a93059f07559b1add6..e0cea87e529645bbc9744b3acc1f1571e8fa632e 100644 (file)
--- a/suites/rados/monthrash/thrashers/many.yaml
+++ b/suites/rados/monthrash/thrashers/many.yaml
@@ -1,13 +1,4 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-        debug paxos: 20
-        debug ms: 1
 tasks:
-- install:
-- ceph:
 - mon_thrash:
     revive_delay: 20
     thrash_delay: 1

diff --git a/suites/rados/monthrash/thrashers/one.yaml b/suites/rados/monthrash/thrashers/one.yaml
index df143b07de03086760341535c7da4f368372245c..2ce44c8601fa576e95efb2d2a87a89ac553b8b5d 100644 (file)
--- a/suites/rados/monthrash/thrashers/one.yaml
+++ b/suites/rados/monthrash/thrashers/one.yaml
@@ -1,13 +1,4 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-        debug paxos: 20
-        debug ms: 1
 tasks:
-- install:
-- ceph:
 - mon_thrash:
     revive_delay: 20
     thrash_delay: 1

diff --git a/suites/rados/monthrash/thrashers/sync-many.yaml b/suites/rados/monthrash/thrashers/sync-many.yaml
index f85b3ab00b3bab1962ab02b2896d5fe08cbe9994..9868f18159f645fb02f0fecbc7e8890aa1cce1fd 100644 (file)
--- a/suites/rados/monthrash/thrashers/sync-many.yaml
+++ b/suites/rados/monthrash/thrashers/sync-many.yaml
@@ -5,8 +5,6 @@ overrides:
         paxos min: 10
         paxos trim min: 10
 tasks:
-- install:
-- ceph:
 - mon_thrash:
     revive_delay: 90
     thrash_delay: 1

diff --git a/suites/rados/monthrash/thrashers/sync.yaml b/suites/rados/monthrash/thrashers/sync.yaml
index 29ef7cffc9af36e532a8bd2e0c5f4dba4eec0b74..1e7054c271d86fad3d03b47c2cb82d47dfde56d2 100644 (file)
--- a/suites/rados/monthrash/thrashers/sync.yaml
+++ b/suites/rados/monthrash/thrashers/sync.yaml
@@ -5,8 +5,6 @@ overrides:
         paxos min: 10
         paxos trim min: 10
 tasks:
-- install:
-- ceph:
 - mon_thrash:
     revive_delay: 90
     thrash_delay: 1