From 654aaa90ed478b3e1e77fb7601dd5957f03dc760 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 29 Jun 2018 09:30:52 -0700 Subject: [PATCH] qa: add one-off clusters to qa/cephfs/clusters To consistently handle openstack configuration. Signed-off-by: Patrick Donnelly --- qa/cephfs/clusters/1-mds-1-client-coloc.yaml | 12 ++++++++++++ qa/cephfs/clusters/1-mds-2-client-coloc.yaml | 12 ++++++++++++ qa/cephfs/clusters/1-mds-3-client.yaml | 15 +++++++++++++++ qa/cephfs/clusters/1-mds-4-client-coloc.yaml | 12 ++++++++++++ .../clusters/1-mds-4-client-coloc.yaml | 1 + .../clusters/4-remote-clients.yaml | 10 ---------- .../fs/multiclient/clusters/1-mds-2-client.yaml | 1 + .../fs/multiclient/clusters/1-mds-3-client.yaml | 1 + .../fs/multiclient/clusters/three_clients.yaml | 15 --------------- .../fs/multiclient/clusters/two_clients.yaml | 14 -------------- .../fs/multifs/clusters/1-mds-2-client-coloc.yaml | 1 + .../fs/multifs/clusters/2-remote-clients.yaml | 10 ---------- .../fs/thrash/clusters/1-mds-1-client-coloc.yaml | 1 + .../fs/thrash/clusters/mds-1active-1standby.yaml | 10 ---------- 14 files changed, 56 insertions(+), 59 deletions(-) create mode 100644 qa/cephfs/clusters/1-mds-1-client-coloc.yaml create mode 100644 qa/cephfs/clusters/1-mds-2-client-coloc.yaml create mode 100644 qa/cephfs/clusters/1-mds-3-client.yaml create mode 100644 qa/cephfs/clusters/1-mds-4-client-coloc.yaml create mode 120000 qa/suites/fs/basic_functional/clusters/1-mds-4-client-coloc.yaml delete mode 100644 qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml create mode 120000 qa/suites/fs/multiclient/clusters/1-mds-2-client.yaml create mode 120000 qa/suites/fs/multiclient/clusters/1-mds-3-client.yaml delete mode 100644 qa/suites/fs/multiclient/clusters/three_clients.yaml delete mode 100644 qa/suites/fs/multiclient/clusters/two_clients.yaml create mode 120000 qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml delete mode 100644 qa/suites/fs/multifs/clusters/2-remote-clients.yaml create mode 120000 qa/suites/fs/thrash/clusters/1-mds-1-client-coloc.yaml delete mode 100644 qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml diff --git a/qa/cephfs/clusters/1-mds-1-client-coloc.yaml b/qa/cephfs/clusters/1-mds-1-client-coloc.yaml new file mode 100644 index 0000000000000..abcfffec63149 --- /dev/null +++ b/qa/cephfs/clusters/1-mds-1-client-coloc.yaml @@ -0,0 +1,12 @@ +roles: +- [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: 4 + size: 20 # GB +- machine: + disk: 200 # GB +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-2-client-coloc.yaml b/qa/cephfs/clusters/1-mds-2-client-coloc.yaml new file mode 100644 index 0000000000000..9f0f0dc390c9c --- /dev/null +++ b/qa/cephfs/clusters/1-mds-2-client-coloc.yaml @@ -0,0 +1,12 @@ +roles: +- [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, client.1] +openstack: +- volumes: # attached to each instance + count: 4 + size: 20 # GB +- machine: + disk: 200 # GB +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-3-client.yaml b/qa/cephfs/clusters/1-mds-3-client.yaml new file mode 100644 index 0000000000000..02e6d6dc67811 --- /dev/null +++ b/qa/cephfs/clusters/1-mds-3-client.yaml @@ -0,0 +1,15 @@ +roles: +- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3] +- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7] +- [client.0] +- [client.1] +- [client.2] +openstack: +- volumes: # attached to each instance + count: 4 + size: 30 # GB +- machine: + disk: 200 # GB +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-4-client-coloc.yaml b/qa/cephfs/clusters/1-mds-4-client-coloc.yaml new file mode 100644 index 0000000000000..6ff916c4eb89b --- /dev/null +++ b/qa/cephfs/clusters/1-mds-4-client-coloc.yaml @@ -0,0 +1,12 @@ +roles: +- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3, client.0, client.1] +- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7, client.2, client.3] +openstack: +- volumes: # attached to each instance + count: 4 + size: 30 # GB +- machine: + disk: 200 # GB +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/suites/fs/basic_functional/clusters/1-mds-4-client-coloc.yaml b/qa/suites/fs/basic_functional/clusters/1-mds-4-client-coloc.yaml new file mode 120000 index 0000000000000..e5444ae226378 --- /dev/null +++ b/qa/suites/fs/basic_functional/clusters/1-mds-4-client-coloc.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-4-client-coloc.yaml \ No newline at end of file diff --git a/qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml b/qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml deleted file mode 100644 index 1c540a4ef4662..0000000000000 --- a/qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml +++ /dev/null @@ -1,10 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, osd.1, osd.2, osd.3, mds.a, mds.b, client.1, client.2, client.3] -- [client.0, osd.4, osd.5, osd.6, osd.7] -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/1-mds-2-client.yaml b/qa/suites/fs/multiclient/clusters/1-mds-2-client.yaml new file mode 120000 index 0000000000000..9f4f161a344a8 --- /dev/null +++ b/qa/suites/fs/multiclient/clusters/1-mds-2-client.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-2-client.yaml \ No newline at end of file diff --git a/qa/suites/fs/multiclient/clusters/1-mds-3-client.yaml b/qa/suites/fs/multiclient/clusters/1-mds-3-client.yaml new file mode 120000 index 0000000000000..6b25e07c4d5cd --- /dev/null +++ b/qa/suites/fs/multiclient/clusters/1-mds-3-client.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-3-client.yaml \ No newline at end of file diff --git a/qa/suites/fs/multiclient/clusters/three_clients.yaml b/qa/suites/fs/multiclient/clusters/three_clients.yaml deleted file mode 100644 index a533af5c62012..0000000000000 --- a/qa/suites/fs/multiclient/clusters/three_clients.yaml +++ /dev/null @@ -1,15 +0,0 @@ -roles: -- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1, osd.2, osd.3] -- [client.2] -- [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 deleted file mode 100644 index 00f3815cbe556..0000000000000 --- a/qa/suites/fs/multiclient/clusters/two_clients.yaml +++ /dev/null @@ -1,14 +0,0 @@ -roles: -- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1, osd.2, osd.3] -- [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/1-mds-2-client-coloc.yaml b/qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml new file mode 120000 index 0000000000000..d5b5c4d560208 --- /dev/null +++ b/qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-2-client-coloc.yaml \ No newline at end of file diff --git a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml deleted file mode 100644 index 2ae772c3f2734..0000000000000 --- a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml +++ /dev/null @@ -1,10 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, osd.1, osd.2, osd.3, mon.b, mds.a, mds.b, client.1] -- [mds.c, mds.d, mon.c, client.0, osd.4, osd.5, osd.6, osd.7] -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/1-mds-1-client-coloc.yaml b/qa/suites/fs/thrash/clusters/1-mds-1-client-coloc.yaml new file mode 120000 index 0000000000000..d15ecfda012ca --- /dev/null +++ b/qa/suites/fs/thrash/clusters/1-mds-1-client-coloc.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-1-client-coloc.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml deleted file mode 100644 index d02524866c3f7..0000000000000 --- a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml +++ /dev/null @@ -1,10 +0,0 @@ -roles: -- [mon.a, mon.c, osd.0, osd.1, osd.2, mds.b-s-a] -- [mon.b, mgr.x, 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