From: John Spray Date: Fri, 18 Jul 2014 16:46:05 +0000 (+0100) Subject: clusters: Remove mds from default fixed-* configs X-Git-Tag: v0.94.10~27^2^2~383^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a06df52a3fc418e0e75691e6f096c62bfcd2c3c4;p=ceph.git 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 --- diff --git a/clusters/fixed-1.yaml b/clusters/fixed-1.yaml index 8ec132330db3..5f3a8f992335 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 79ed8cb5e21f..9a93c9cbd09d 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/clusters/fixed-3-cephfs.yaml b/clusters/fixed-3-cephfs.yaml new file mode 100644 index 000000000000..e1d3c7b7932b --- /dev/null +++ b/clusters/fixed-3-cephfs.yaml @@ -0,0 +1,4 @@ +roles: +- [mon.a, mds.a, osd.0, osd.1] +- [mon.b, mon.c, osd.2, osd.3, client.0] +- [client.1] diff --git a/clusters/fixed-3.yaml b/clusters/fixed-3.yaml index 0038432afa7d..455de4f98311 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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/mixed-clients/clusters/fixed-3.yaml b/suites/kcephfs/mixed-clients/clusters/fixed-3.yaml deleted file mode 100644 index e1d3c7b7932b..000000000000 --- a/suites/kcephfs/mixed-clients/clusters/fixed-3.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mds.a, osd.0, osd.1] -- [mon.b, mon.c, osd.2, osd.3, client.0] -- [client.1] 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- 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 000000000000..a482e6504214 --- /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 a3ac9fc4dec2..000000000000 --- a/suites/stress/bench/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file