From 1d0fb21933385929656bad27b317e7176cba797a Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 29 Aug 2016 10:27:26 +0200 Subject: [PATCH] openstack: add disks where necessary Ref: http://tracker.ceph.com/issues/17152 Signed-off-by: Loic Dachary (cherry picked from commit 52017e6707c32fec38788a52f918480909b78ef5) --- suites/rados/multimon/clusters/21.yaml | 4 ++++ suites/rados/multimon/clusters/3.yaml | 4 ++++ suites/rados/multimon/clusters/6.yaml | 4 ++++ suites/rados/multimon/clusters/9.yaml | 4 ++++ suites/rados/objectstore/ceph_objectstore_tool.yaml | 5 ++++- suites/rados/objectstore/filejournal.yaml | 4 ++++ .../rados/objectstore/filestore-idempotent-aio-journal.yaml | 4 ++++ suites/rados/objectstore/filestore-idempotent.yaml | 4 ++++ suites/rados/objectstore/objectcacher-stress.yaml | 4 ++++ suites/rados/objectstore/objectstore.yaml | 4 ++++ 10 files changed, 40 insertions(+), 1 deletion(-) diff --git a/suites/rados/multimon/clusters/21.yaml b/suites/rados/multimon/clusters/21.yaml index b1ab62cc567f2..646ff15d45e4f 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 309809648da84..e30dc76f381d8 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 6211cead9afab..b16e3267c06fa 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 3d2cf53f5c510..c2c7b494ed800 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 206552456e84e..881d908f06b3f 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 c647a61b74b4a..69ffab2092cfc 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 17fe5158cac2c..c97d7cd8cb7db 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 3d1894c6b6d56..39b2f0fb00682 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 8b091c909249b..7cb78a76e7e16 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 a0ece14876ded..23d650b9d2e49 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: -- 2.39.5