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 <[email protected]>
yuriw · Jul 18, 2014 · a06df52 · a06df52
1 parent d81d77d
commit a06df52
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 11 deletions.
diff --git 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
@@ -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/...ephfs/mixed-clients/clusters/fixed-3.yaml → clusters/fixed-3-cephfs.yaml b/...ephfs/mixed-clients/clusters/fixed-3.yaml → clusters/fixed-3-cephfs.yaml
diff --git 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
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/fs/basic/clusters/fixed-3.yaml b/suites/fs/basic/clusters/fixed-3.yaml
diff --git a/suites/fs/snaps/clusters/fixed-3-cephfs.yaml b/suites/fs/snaps/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/fs/snaps/clusters/fixed-3.yaml b/suites/fs/snaps/clusters/fixed-3.yaml
diff --git a/suites/fs/traceless/clusters/fixed-3-cephfs.yaml b/suites/fs/traceless/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/fs/traceless/clusters/fixed-3.yaml b/suites/fs/traceless/clusters/fixed-3.yaml
diff --git a/suites/fs/verify/clusters/fixed-3-cephfs.yaml b/suites/fs/verify/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/fs/verify/clusters/fixed-3.yaml b/suites/fs/verify/clusters/fixed-3.yaml
diff --git a/suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml b/suites/kcephfs/cephfs/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/kcephfs/cephfs/clusters/fixed-3.yaml b/suites/kcephfs/cephfs/clusters/fixed-3.yaml
diff --git a/suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml b/suites/kcephfs/mixed-clients/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml b/suites/kcephfs/thrash/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/kcephfs/thrash/clusters/fixed-3.yaml b/suites/kcephfs/thrash/clusters/fixed-3.yaml
diff --git a/suites/smoke/basic/clusters/fixed-3-cephfs.yaml b/suites/smoke/basic/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/smoke/basic/clusters/fixed-3.yaml b/suites/smoke/basic/clusters/fixed-3.yaml
diff --git a/suites/stress/bench/clusters/fixed-3-cephfs.yaml b/suites/stress/bench/clusters/fixed-3-cephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3-cephfs.yaml
diff --git a/suites/stress/bench/clusters/fixed-3.yaml b/suites/stress/bench/clusters/fixed-3.yaml