From 0d5763eba5aa4410461bbdf494b7334551142945 Mon Sep 17 00:00:00 2001
From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 6 Jan 2014 15:59:31 -0500
Subject: [PATCH] add missing/required OSDs to the rest of ceph-deploy tasks

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 2e721f0d7c5f344168d70959bb1478a0f3393718)
---
 suites/ceph-deploy/rados/tasks/rados_api_tests.yaml         | 4 +++-
 suites/ceph-deploy/rados/tasks/rados_python.yaml            | 4 +++-
 .../ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml | 4 +++-
 suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml  | 6 +++++-
 suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml             | 6 +++++-
 suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml              | 6 +++++-
 suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml      | 5 ++++-
 suites/ceph-deploy/singleton/all/basic-test.yaml            | 4 +++-
 8 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
index 16f98fd9565..8fb3205e09c 100644
--- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
@@ -3,9 +3,11 @@ roles:
   - mds.0
   - osd.0
   - osd.1
-- - mon.b
   - osd.2
+- - mon.b
   - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/rados/tasks/rados_python.yaml b/suites/ceph-deploy/rados/tasks/rados_python.yaml
index d3819ce87b4..b1f92d5c86a 100644
--- a/suites/ceph-deploy/rados/tasks/rados_python.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_python.yaml
@@ -3,9 +3,11 @@ roles:
   - mds.0
   - osd.0
   - osd.1
-- - mon.b
   - osd.2
+- - mon.b
   - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml b/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
index a4633b7a066..103ebbc2eb9 100644
--- a/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
@@ -3,9 +3,11 @@ roles:
   - mds.0
   - osd.0
   - osd.1
-- - mon.b
   - osd.2
+- - mon.b
   - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml b/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
index cb4906fdb17..96100d8de01 100644
--- a/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
@@ -2,8 +2,12 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-- - mon.b
   - osd.1
+  - osd.2
+- - mon.b
+  - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml b/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
index 3b33295cc86..7222c5d0dec 100644
--- a/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
@@ -2,8 +2,12 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-- - mon.b
   - osd.1
+  - osd.2
+- - mon.b
+  - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml b/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
index db9bf179786..ad8a691f1c1 100644
--- a/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
@@ -2,8 +2,12 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-- - mon.b
   - osd.1
+  - osd.2
+- - mon.b
+  - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
index 32cf6dba30a..00ccef042bd 100644
--- a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
@@ -3,8 +3,11 @@ roles:
   - mds.0
   - osd.0
   - osd.1
-- - mon.b
   - osd.2
+- - mon.b
+  - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 tasks:
 - install:
diff --git a/suites/ceph-deploy/singleton/all/basic-test.yaml b/suites/ceph-deploy/singleton/all/basic-test.yaml
index 4b228f5d125..1ad49654676 100644
--- a/suites/ceph-deploy/singleton/all/basic-test.yaml
+++ b/suites/ceph-deploy/singleton/all/basic-test.yaml
@@ -3,9 +3,11 @@ roles:
   - mds.0
   - osd.0
   - osd.1
-- - mon.b 
   - osd.2
+- - mon.b
   - osd.3
+  - osd.4
+  - osd.5
 - - client.0
 
 tasks: