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 <john.spray@redhat.com>

diff --git a/clusters/fixed-1.yaml b/clusters/fixed-1.yaml
index 8ec132330db3ba0391205a47a2ce087808054c6c..5f3a8f9923357346b4be6af2df98fe16e390d049 100644 (file)
--- 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 79ed8cb5e21fec8c186a7ae4327581c0da8c84cf..9a93c9cbd09d3dafe55570ce990af53ae137b463 100644 (file)
--- 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 (file)
index 0000000..e1d3c7b
--- /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 0038432afa7dca757dcb9ced966aa954d4d7d283..455de4f98311ec871733f216363a401726bbc453 100644 (file)
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (file)
index e1d3c7b..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (symlink)
index 0000000..a482e65
--- /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 (symlink)
index a3ac9fc..0000000
--- a/suites/stress/bench/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file