rgw: increase the number of OSDs for erasure coded pools

So that there never is less than 4 osd which is the minimum when trying
erasure coded workloads that only work with 4 osd.

http://tracker.ceph.com/issues/9298 Fixes: #9298

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml b/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
index 0e61941718e007194f73ac73e6358cb3abd06eb0..a619f225d9cff7628da578278ed692cb85c89b65 100644 (file)
--- a/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
+++ b/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0, client.1]
+- [mon.a, osd.0, osd.1, osd.2, osd.3, client.0, client.1]
 tasks:
 - install:
 - ceph:

diff --git a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
index 70d2ec61673d723fdb4b0ef99ff86ab8140b676b..5ac26c288b3df2a5fb3f9a2ba1c24633ddc0da3a 100644 (file)
--- a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
+++ b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
-- [mon.b, mon.c, osd.2, osd.3, client.1]
+- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.b, mon.c, osd.3, osd.4, osd.5, client.1]
 tasks:
 - install: 
 - ceph:

diff --git a/suites/rgw/singleton/all/radosgw-admin.yaml b/suites/rgw/singleton/all/radosgw-admin.yaml
index 837ef623fb9b8f98d1605fca1e5f3d547962a57b..fd2a131fdbbd3a50b1f69d727f770d64d9910024 100644 (file)
--- a/suites/rgw/singleton/all/radosgw-admin.yaml
+++ b/suites/rgw/singleton/all/radosgw-admin.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, client.0, osd.1]
+- [mon.a, osd.0, client.0, osd.1, osd.2, osd.3]
 tasks:
 - install:
 - ceph:

diff --git a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
index 696d6b5fd642bf0283d786e86547aa1252afad25..2cf690c79da36b43bec4acfa538291661ee54f7b 100644 (file)
--- a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
+++ b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
@@ -15,8 +15,8 @@ overrides:
         size: 2000
         stddev: 500
 roles:
-- [mon.a, osd.0, osd.1, client.0]
-- [mon.b, mon.c, osd.2, osd.3, client.1]
+- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.b, mon.c, osd.3, osd.4, osd.5, client.1]
 
 tasks:
 - install: