From: Sage Weil <sage@inktank.com>
Date: Sat, 6 Jul 2013 00:37:19 +0000 (-0700)
Subject: rados/monthrash: refactor a bit
X-Git-Tag: v0.94.10~27^2^2~653
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbf12a31aa02c73303e25ebc14b54bce3148c866;p=ceph.git

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
index 000000000000..2030acb90836
--- /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 3efb5f63d5f9..2867f2db5ec7 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 565a383a6afe..e0cea87e5296 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 df143b07de03..2ce44c8601fa 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 f85b3ab00b3b..9868f18159f6 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 29ef7cffc9af..1e7054c271d8 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