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)

diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
index 16f98fd956547ad969365ed8e8046ecf4cf925c1..8fb3205e09c2001f21c27082991310afe54615a7 100644 (file)
--- 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 d3819ce87b4d3c6dbc1ce638679099a0e2223b74..b1f92d5c86a61e5bdcf30aa4c927af68bd34e6d6 100644 (file)
--- 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 a4633b7a0667a517a3ab8aa918254d72dd5ff369..103ebbc2eb994cac659e72465dc9f995f445fe83 100644 (file)
--- 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 cb4906fdb178cd5e60219ca41ea6b9f0b7858823..96100d8de01b0fb2daca8a393bbc0ebfe8507382 100644 (file)
--- 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 3b33295cc868f4ee43a0c3da1a522b514efa5d23..7222c5d0dec191b16a9f9cb94b159bb6321aef31 100644 (file)
--- 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 db9bf1797862e1443ce4149037af98a5d20c71fd..ad8a691f1c14f68ed9b9d01ac4b5e2a39bfaaa7e 100644 (file)
--- 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 32cf6dba30ab33159e653ef6af48378e22a97dba..00ccef042bd06bb2e2cf35a8bf70d15e730c3d63 100644 (file)
--- 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 4b228f5d1253ff875b10a59fef367d0c6a02f20b..1ad49654676d2aacf4a88d09d32bad830edfd8ea 100644 (file)
--- 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: