From dbf12a31aa02c73303e25ebc14b54bce3148c866 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Fri, 5 Jul 2013 17:37:19 -0700
Subject: [PATCH] rados/monthrash: refactor a bit

Signed-off-by: Sage Weil <sage@inktank.com>
---
 suites/rados/monthrash/ceph/ceph.yaml                 | 3 +++
 suites/rados/monthrash/thrashers/force-sync-many.yaml | 2 --
 suites/rados/monthrash/thrashers/many.yaml            | 9 ---------
 suites/rados/monthrash/thrashers/one.yaml             | 9 ---------
 suites/rados/monthrash/thrashers/sync-many.yaml       | 2 --
 suites/rados/monthrash/thrashers/sync.yaml            | 2 --
 6 files changed, 3 insertions(+), 24 deletions(-)
 create mode 100644 suites/rados/monthrash/ceph/ceph.yaml

diff --git a/suites/rados/monthrash/ceph/ceph.yaml b/suites/rados/monthrash/ceph/ceph.yaml
new file mode 100644
index 00000000000..2030acb9083
--- /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 3efb5f63d5f..2867f2db5ec 100644
--- 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 565a383a6af..e0cea87e529 100644
--- 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 df143b07de0..2ce44c8601f 100644
--- 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 f85b3ab00b3..9868f18159f 100644
--- 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 29ef7cffc9a..1e7054c271d 100644
--- 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