From e8a0f1c554cad7529e49dcacfd8506c7e33f949a Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 9 Jan 2018 16:47:25 -0800 Subject: [PATCH 1/2] qa: add missing openstack configs First introduced in: ec6fb28eaf8e2db327e4afc115879a40c7664e07 Signed-off-by: Patrick Donnelly --- qa/cephfs/clusters/3-mds.yaml | 4 ++++ qa/cephfs/clusters/9-mds.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/qa/cephfs/clusters/3-mds.yaml b/qa/cephfs/clusters/3-mds.yaml index 05c6142f8cb..71f39af0895 100644 --- a/qa/cephfs/clusters/3-mds.yaml +++ b/qa/cephfs/clusters/3-mds.yaml @@ -2,3 +2,7 @@ roles: - [mon.a, mon.c, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3] - [mon.b, mgr.x, mds.b, mds.c, osd.4, osd.5, osd.6, osd.7] - [client.0] +openstack: +- volumes: # attached to each instance + count: 4 + size: 10 # GB diff --git a/qa/cephfs/clusters/9-mds.yaml b/qa/cephfs/clusters/9-mds.yaml index a6342dc0672..86be381ee6e 100644 --- a/qa/cephfs/clusters/9-mds.yaml +++ b/qa/cephfs/clusters/9-mds.yaml @@ -2,3 +2,7 @@ roles: - [mon.a, mon.c, mgr.y, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2, osd.3] - [mon.b, mgr.x, mds.e, mds.f, mds.g, mds.h, mds.i, osd.4, osd.5, osd.6, osd.7] - [client.0] +openstack: +- volumes: # attached to each instance + count: 4 + size: 10 # GB From f8c275b8b6c59c2f269990ec81e503a54c0dc7c1 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 9 Jan 2018 16:48:18 -0800 Subject: [PATCH 2/2] qa: increase osd count for ec testing Missing in d0732fc96fbc6849dd51b391d85f765c74cfb593. Fixes: http://tracker.ceph.com/issues/22646 Signed-off-by: Patrick Donnelly --- qa/cephfs/clusters/fixed-2-ucephfs.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/cephfs/clusters/fixed-2-ucephfs.yaml b/qa/cephfs/clusters/fixed-2-ucephfs.yaml index 5f4773fc5ae..94948f4c39d 100644 --- a/qa/cephfs/clusters/fixed-2-ucephfs.yaml +++ b/qa/cephfs/clusters/fixed-2-ucephfs.yaml @@ -1,9 +1,9 @@ roles: -- [mon.a, mds.a, mgr.x, osd.0, osd.1, client.0] -- [mon.b, mds.a-s, mon.c, mgr.y, osd.2, osd.3] +- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3, client.0] +- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7] openstack: - volumes: # attached to each instance - count: 2 + count: 4 size: 10 # GB log-rotate: ceph-mds: 10G