From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 29 Aug 2016 08:27:26 +0000 (+0200)
Subject: openstack: add disks where necessary
X-Git-Tag: v0.94.10~27^2^2~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d0fb21933385929656bad27b317e7176cba797a;p=ceph.git

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 b1ab62cc567f..646ff15d45e4 100644
--- 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 309809648da8..e30dc76f381d 100644
--- 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 6211cead9afa..b16e3267c06f 100644
--- 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 3d2cf53f5c51..c2c7b494ed80 100644
--- 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 206552456e84..881d908f06b3 100644
--- 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 c647a61b74b4..69ffab2092cf 100644
--- 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 17fe5158cac2..c97d7cd8cb7d 100644
--- 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 3d1894c6b6d5..39b2f0fb0068 100644
--- 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 8b091c909249..7cb78a76e7e1 100644
--- 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 a0ece14876de..23d650b9d2e4 100644
--- 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: