From a06df52a3fc418e0e75691e6f096c62bfcd2c3c4 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 18 Jul 2014 17:46:05 +0100 Subject: [PATCH] clusters: Remove mds from default fixed-* configs Create a separate fixed-3-cephfs cluster config for use in the filesystem tests. Signed-off-by: John Spray --- clusters/fixed-1.yaml | 2 +- clusters/fixed-2.yaml | 2 +- .../clusters/fixed-3.yaml => clusters/fixed-3-cephfs.yaml | 0 clusters/fixed-3.yaml | 2 +- suites/fs/basic/clusters/fixed-3-cephfs.yaml | 1 + suites/fs/basic/clusters/fixed-3.yaml | 1 - suites/fs/snaps/clusters/fixed-3-cephfs.yaml | 1 + suites/fs/snaps/clusters/fixed-3.yaml | 1 - suites/fs/traceless/clusters/fixed-3-cephfs.yaml | 1 + suites/fs/traceless/clusters/fixed-3.yaml | 1 - suites/fs/verify/clusters/fixed-3-cephfs.yaml | 1 + suites/fs/verify/clusters/fixed-3.yaml | 1 - suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml | 1 + suites/kcephfs/cephfs/clusters/fixed-3.yaml | 1 - suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml | 1 + suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml | 1 + suites/kcephfs/thrash/clusters/fixed-3.yaml | 1 - suites/smoke/basic/clusters/fixed-3-cephfs.yaml | 1 + suites/smoke/basic/clusters/fixed-3.yaml | 1 - suites/stress/bench/clusters/fixed-3-cephfs.yaml | 1 + suites/stress/bench/clusters/fixed-3.yaml | 1 - 21 files changed, 12 insertions(+), 11 deletions(-) rename suites/kcephfs/mixed-clients/clusters/fixed-3.yaml => clusters/fixed-3-cephfs.yaml (100%) create mode 120000 suites/fs/basic/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/fs/basic/clusters/fixed-3.yaml create mode 120000 suites/fs/snaps/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/fs/snaps/clusters/fixed-3.yaml create mode 120000 suites/fs/traceless/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/fs/traceless/clusters/fixed-3.yaml create mode 120000 suites/fs/verify/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/fs/verify/clusters/fixed-3.yaml create mode 120000 suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/kcephfs/cephfs/clusters/fixed-3.yaml create mode 120000 suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml create mode 120000 suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/kcephfs/thrash/clusters/fixed-3.yaml create mode 120000 suites/smoke/basic/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/smoke/basic/clusters/fixed-3.yaml create mode 120000 suites/stress/bench/clusters/fixed-3-cephfs.yaml delete mode 120000 suites/stress/bench/clusters/fixed-3.yaml diff --git a/clusters/fixed-1.yaml b/clusters/fixed-1.yaml index 8ec132330db3b..5f3a8f9923357 100644 --- a/clusters/fixed-1.yaml +++ b/clusters/fixed-1.yaml @@ -1,2 +1,2 @@ roles: -- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, client.0] +- [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, client.0] diff --git a/clusters/fixed-2.yaml b/clusters/fixed-2.yaml index 79ed8cb5e21fe..9a93c9cbd09d3 100644 --- a/clusters/fixed-2.yaml +++ b/clusters/fixed-2.yaml @@ -1,3 +1,3 @@ roles: - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] -- [mon.b, mds.a, osd.3, osd.4, osd.5, client.1] +- [mon.b, osd.3, osd.4, osd.5, client.1] diff --git a/suites/kcephfs/mixed-clients/clusters/fixed-3.yaml b/clusters/fixed-3-cephfs.yaml similarity index 100% rename from suites/kcephfs/mixed-clients/clusters/fixed-3.yaml rename to clusters/fixed-3-cephfs.yaml diff --git a/clusters/fixed-3.yaml b/clusters/fixed-3.yaml index 0038432afa7dc..455de4f98311e 100644 --- a/clusters/fixed-3.yaml +++ b/clusters/fixed-3.yaml @@ -1,4 +1,4 @@ roles: - [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mds.a, osd.3, osd.4, osd.5] +- [mon.b, osd.3, osd.4, osd.5] - [client.0] diff --git a/suites/fs/basic/clusters/fixed-3-cephfs.yaml b/suites/fs/basic/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/fs/basic/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/fs/basic/clusters/fixed-3.yaml b/suites/fs/basic/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/fs/basic/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/fs/snaps/clusters/fixed-3-cephfs.yaml b/suites/fs/snaps/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/fs/snaps/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/fs/snaps/clusters/fixed-3.yaml b/suites/fs/snaps/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/fs/snaps/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/fs/traceless/clusters/fixed-3-cephfs.yaml b/suites/fs/traceless/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/fs/traceless/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/fs/traceless/clusters/fixed-3.yaml b/suites/fs/traceless/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/fs/traceless/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/fs/verify/clusters/fixed-3-cephfs.yaml b/suites/fs/verify/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/fs/verify/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/fs/verify/clusters/fixed-3.yaml b/suites/fs/verify/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/fs/verify/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml b/suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/cephfs/clusters/fixed-3.yaml b/suites/kcephfs/cephfs/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/kcephfs/cephfs/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml b/suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml b/suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/thrash/clusters/fixed-3.yaml b/suites/kcephfs/thrash/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/kcephfs/thrash/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/smoke/basic/clusters/fixed-3-cephfs.yaml b/suites/smoke/basic/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/smoke/basic/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/smoke/basic/clusters/fixed-3.yaml b/suites/smoke/basic/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/smoke/basic/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/stress/bench/clusters/fixed-3-cephfs.yaml b/suites/stress/bench/clusters/fixed-3-cephfs.yaml new file mode 120000 index 0000000000000..a482e65042146 --- /dev/null +++ b/suites/stress/bench/clusters/fixed-3-cephfs.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3-cephfs.yaml \ No newline at end of file diff --git a/suites/stress/bench/clusters/fixed-3.yaml b/suites/stress/bench/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/stress/bench/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file -- 2.39.5