use fewer nodes for the simple singleton tasks

diff --git a/suites/regression/singleton/all/dump-stuck.yaml b/suites/regression/singleton/all/dump-stuck.yaml
index 9e83a92f293c7ec6847ab16a9837d34f3e46774b..31f10f669e5963873eb1cbf98da281de2f9e5511 100644 (file)
--- a/suites/regression/singleton/all/dump-stuck.yaml
+++ b/suites/regression/singleton/all/dump-stuck.yaml
@@ -2,7 +2,7 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-- - osd.1
+  - osd.1
 tasks:
 - ceph:
     log-whitelist:

diff --git a/suites/regression/singleton/all/lost-unfound.yaml b/suites/regression/singleton/all/lost-unfound.yaml
index fe74cc3b59d56009c85be84c97c3105e20772453..ee1cbb207979a022b5a028daa7b0f31b4abdb7a0 100644 (file)
--- a/suites/regression/singleton/all/lost-unfound.yaml
+++ b/suites/regression/singleton/all/lost-unfound.yaml
@@ -1,10 +1,10 @@
 roles:
-- - mon.0
+- - mon.a
+  - mon.b
+  - mon.c
   - mds.a
   - osd.0
-- - mon.1
   - osd.1
-- - mon.2
   - osd.2
 tasks:
 - ceph:

diff --git a/suites/regression/singleton/all/osd-backfill.yaml b/suites/regression/singleton/all/osd-backfill.yaml
index 85e3b814fd7316a72450e10c3b6c31f85e439f65..fd3d82e03800a11c52b195630791e932779ea852 100644 (file)
--- a/suites/regression/singleton/all/osd-backfill.yaml
+++ b/suites/regression/singleton/all/osd-backfill.yaml
@@ -1,10 +1,10 @@
 roles:
 - - mon.a
+  - mon.b
+  - mon.c
   - mds.a
   - osd.0
   - osd.1
-- - mon.b
-  - mon.c
   - osd.2
 tasks:
 - ceph:

diff --git a/suites/regression/singleton/all/osd-recovery.yaml b/suites/regression/singleton/all/osd-recovery.yaml
index 32de4c2a265e419023d2af988222799f447b13e2..7705151b029f54f10183d5fb9924c9f9a5c8f059 100644 (file)
--- a/suites/regression/singleton/all/osd-recovery.yaml
+++ b/suites/regression/singleton/all/osd-recovery.yaml
@@ -1,10 +1,10 @@
 roles:
 - - mon.a
+  - mon.b
+  - mon.c
   - mds.a
   - osd.0
   - osd.1
-- - mon.b
-  - mon.c
   - osd.2
 tasks:
 - ceph:

diff --git a/suites/regression/singleton/all/peer.yaml b/suites/regression/singleton/all/peer.yaml
index 2e73715c6bae627359c84fc83d5abc306038cbca..17a64567a7c0c1d36c42cd4c1b293a26d8ef7646 100644 (file)
--- a/suites/regression/singleton/all/peer.yaml
+++ b/suites/regression/singleton/all/peer.yaml
@@ -1,10 +1,10 @@
 roles:
 - - mon.0
+  - mon.1
+  - mon.2
   - mds.a
   - osd.0
-- - mon.1
   - osd.1
-- - mon.2
   - osd.2
 tasks:
 - ceph:

diff --git a/suites/regression/singleton/all/thrash-rados.yaml b/suites/regression/singleton/all/thrash-rados.yaml
index 295a6b7811616f7504295730cd8580ae9b4a1171..9ebd4a95f87d580e9bb2b4433a78561180bdaae5 100644 (file)
--- a/suites/regression/singleton/all/thrash-rados.yaml
+++ b/suites/regression/singleton/all/thrash-rados.yaml
@@ -2,11 +2,12 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-- - osd.1
-- - osd.2
+  - osd.1
+  - osd.2
 - - osd.3
-- - osd.4
-- - client.0
+  - osd.4
+  - osd.5
+  - client.0
 tasks:
 - ceph:
     log-whitelist: