openstack: add disks where necessary

Ref: http://tracker.ceph.com/issues/17152

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 52017e6707c32fec38788a52f918480909b78ef5)

diff --git a/suites/rados/multimon/clusters/21.yaml b/suites/rados/multimon/clusters/21.yaml
index b1ab62cc567f2e06e15bfb198df2d28ea8215d99..646ff15d45e4f44818d341c0f9c3235886434690 100644 (file)
--- a/suites/rados/multimon/clusters/21.yaml
+++ b/suites/rados/multimon/clusters/21.yaml
@@ -2,3 +2,7 @@ roles:
 - [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0]
 - [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t]
 - [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]
+openstack:
+- volumes: # attached to each instance
+    count: 1
+    size: 10 # GB

diff --git a/suites/rados/multimon/clusters/3.yaml b/suites/rados/multimon/clusters/3.yaml
index 309809648da840af4d47a7a32d39b88a7cc3c161..e30dc76f381d8e74abb8b797d4d4db89aca25789 100644 (file)
--- a/suites/rados/multimon/clusters/3.yaml
+++ b/suites/rados/multimon/clusters/3.yaml
@@ -1,2 +1,6 @@
 roles:
 - [mon.a, mon.b, mon.c, osd.0, osd.1]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB

diff --git a/suites/rados/multimon/clusters/6.yaml b/suites/rados/multimon/clusters/6.yaml
index 6211cead9afaba895cb262a423e1044f35b2cd4f..b16e3267c06fa57ff65af069482ddb299ef6fab2 100644 (file)
--- a/suites/rados/multimon/clusters/6.yaml
+++ b/suites/rados/multimon/clusters/6.yaml
@@ -1,3 +1,7 @@
 roles:
 - [mon.a, mon.c, mon.e, osd.0]
 - [mon.b, mon.d, mon.f, osd.1]
+openstack:
+- volumes: # attached to each instance
+    count: 1
+    size: 10 # GB

diff --git a/suites/rados/multimon/clusters/9.yaml b/suites/rados/multimon/clusters/9.yaml
index 3d2cf53f5c510568b3267e90728516156ca13913..c2c7b494ed800d1f014dcc75529217cfcc6fd0d7 100644 (file)
--- a/suites/rados/multimon/clusters/9.yaml
+++ b/suites/rados/multimon/clusters/9.yaml
@@ -2,3 +2,7 @@ roles:
 - [mon.a, mon.d, mon.g, osd.0]
 - [mon.b, mon.e, mon.h]
 - [mon.c, mon.f, mon.i, osd.1]
+openstack:
+- volumes: # attached to each instance
+    count: 1
+    size: 10 # GB

diff --git a/suites/rados/objectstore/ceph_objectstore_tool.yaml b/suites/rados/objectstore/ceph_objectstore_tool.yaml
index 206552456e84ee1a3817597191473844a2641a14..881d908f06b3f1b5ee4d9f606a0a6973c047c7e8 100644 (file)
--- a/suites/rados/objectstore/ceph_objectstore_tool.yaml
+++ b/suites/rados/objectstore/ceph_objectstore_tool.yaml
@@ -1,6 +1,9 @@
 roles:
 - [mon.0, osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, client.0]
-
+openstack:
+- volumes: # attached to each instance
+    count: 6
+    size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/objectstore/filejournal.yaml b/suites/rados/objectstore/filejournal.yaml
index c647a61b74b4a7c30b96718130270c6cf5c473c5..69ffab2092cfc7ea9548c8800f75d5519fdd1052 100644 (file)
--- a/suites/rados/objectstore/filejournal.yaml
+++ b/suites/rados/objectstore/filejournal.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.0, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml b/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
index 17fe5158cac2c1f3f7d714b2a5f502f3552a71de..c97d7cd8cb7db0847dcff3788e6197a3181caf58 100644 (file)
--- a/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
+++ b/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.0, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/objectstore/filestore-idempotent.yaml b/suites/rados/objectstore/filestore-idempotent.yaml
index 3d1894c6b6d5679639b312a0930f160589a90a7d..39b2f0fb00682fdf7e3345a78a42b3232d27393f 100644 (file)
--- a/suites/rados/objectstore/filestore-idempotent.yaml
+++ b/suites/rados/objectstore/filestore-idempotent.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.0, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/objectstore/objectcacher-stress.yaml b/suites/rados/objectstore/objectcacher-stress.yaml
index 8b091c909249baaab6c493da23255db293e3295a..7cb78a76e7e166841966cfc37b34c3c0f2ea736d 100644 (file)
--- a/suites/rados/objectstore/objectcacher-stress.yaml
+++ b/suites/rados/objectstore/objectcacher-stress.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.0, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/objectstore/objectstore.yaml b/suites/rados/objectstore/objectstore.yaml
index a0ece14876ded71d6a59db40bc76e5f587d86f2f..23d650b9d2e4921e5c0737643ddf0d6b3a12f8c1 100644 (file)
--- a/suites/rados/objectstore/objectstore.yaml
+++ b/suites/rados/objectstore/objectstore.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.0, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 tasks:
 - install:
 - exec: