From 841688bb2e46bade3ede4a902c0b42a99e6a62f6 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 24 Feb 2017 15:25:19 -0700 Subject: [PATCH] qa/suites/fs: Add openstack volume configuration Signed-off-by: Zack Cerza (cherry picked from commit b076d89a3f1fbad7d477913812b2e17529abeacf) --- qa/clusters/fixed-2-ucephfs.yaml | 4 ++++ qa/suites/fs/multiclient/clusters/three_clients.yaml | 5 +++++ qa/suites/fs/multiclient/clusters/two_clients.yaml | 5 +++++ qa/suites/fs/multifs/clusters/2-remote-clients.yaml | 4 ++++ qa/suites/fs/recovery/clusters/4-remote-clients.yaml | 4 ++++ qa/suites/fs/standbyreplay/clusters/standby-replay.yaml | 4 ++++ qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml | 4 ++++ 7 files changed, 30 insertions(+) diff --git a/qa/clusters/fixed-2-ucephfs.yaml b/qa/clusters/fixed-2-ucephfs.yaml index ab74a23d09095..bc120ad0b29fb 100644 --- a/qa/clusters/fixed-2-ucephfs.yaml +++ b/qa/clusters/fixed-2-ucephfs.yaml @@ -1,6 +1,10 @@ roles: - [mon.a, mds.a, osd.0, osd.1, client.0] - [mon.b, mds.a-s, mon.c, osd.2, osd.3] +openstack: +- volumes: # attached to each instance + count: 2 + size: 10 # GB log-rotate: ceph-mds: 10G ceph-osd: 10G diff --git a/qa/suites/fs/multiclient/clusters/three_clients.yaml b/qa/suites/fs/multiclient/clusters/three_clients.yaml index bf87f26f7fa70..1fc1b4454404e 100644 --- a/qa/suites/fs/multiclient/clusters/three_clients.yaml +++ b/qa/suites/fs/multiclient/clusters/three_clients.yaml @@ -4,6 +4,11 @@ roles: - [client.1] - [client.0] +openstack: +- volumes: # attached to each instance + count: 1 + size: 10 # GB + log-rotate: ceph-mds: 10G ceph-osd: 10G diff --git a/qa/suites/fs/multiclient/clusters/two_clients.yaml b/qa/suites/fs/multiclient/clusters/two_clients.yaml index 2bcf4dc739113..e6d82601cfdc1 100644 --- a/qa/suites/fs/multiclient/clusters/two_clients.yaml +++ b/qa/suites/fs/multiclient/clusters/two_clients.yaml @@ -3,6 +3,11 @@ roles: - [client.1] - [client.0] +openstack: +- volumes: # attached to each instance + count: 3 + size: 10 # GB + log-rotate: ceph-mds: 10G ceph-osd: 10G diff --git a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml index 1595fe4360409..b5ff712cb4723 100644 --- a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml +++ b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml @@ -1,6 +1,10 @@ roles: - [mon.a, osd.0, mon.b, mds.a, mds.b, client.1] - [mds.c, mds.d, mon.c, client.0, osd.1, osd.2] +openstack: +- volumes: # attached to each instance + count: 2 + size: 10 # GB log-rotate: ceph-mds: 10G ceph-osd: 10G diff --git a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml index 702bb161e75b5..6b5e23b6c1f7c 100644 --- a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml +++ b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml @@ -1,6 +1,10 @@ roles: - [mon.a, osd.0, mds.a, mds.b, client.1, client.2, client.3] - [client.0, osd.1, osd.2] +openstack: +- volumes: # attached to each instance + count: 2 + size: 10 # GB log-rotate: ceph-mds: 10G ceph-osd: 10G diff --git a/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml b/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml index 011503946ad37..ba2442b27ca70 100644 --- a/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml +++ b/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml @@ -8,6 +8,10 @@ overrides: roles: - [mon.a, mds.a, mds.b-s-0, osd.0, osd.1, client.0] - [mon.b, mds.c-s-0, mds.d-s-0, mon.c, osd.2, osd.3] +openstack: +- volumes: # attached to each instance + count: 2 + size: 10 # GB log-rotate: ceph-mds: 10G ceph-osd: 10G diff --git a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml index e981076d72784..cceea69e2636b 100644 --- a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml +++ b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml @@ -1,6 +1,10 @@ roles: - [mon.a, mon.c, osd.0, osd.1, osd.2, mds.b-s-a] - [mon.b, mds.a, osd.3, osd.4, osd.5, client.0] +openstack: +- volumes: # attached to each instance + count: 3 + size: 10 # GB log-rotate: ceph-mds: 10G ceph-osd: 10G -- 2.39.5