suites/fs: use a two-node layout for most userspace tests

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/clusters/fixed-2-ucephfs.yaml b/clusters/fixed-2-ucephfs.yaml
new file mode 100644 (file)
index 0000000..b1d8678
--- /dev/null
+++ b/clusters/fixed-2-ucephfs.yaml
@@ -0,0 +1,3 @@
+roles:
+- [mon.a, mds.a, osd.0, osd.1, client.0]
+- [mon.b, mds.a-s, mon.c, osd.2, osd.3]

diff --git a/suites/fs/basic/clusters/fixed-2-ucephfs.yaml b/suites/fs/basic/clusters/fixed-2-ucephfs.yaml
new file mode 120000 (symlink)
index 0000000..825c5b9
--- /dev/null
+++ b/suites/fs/basic/clusters/fixed-2-ucephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2-ucephfs.yaml
\ No newline at end of file

diff --git a/suites/fs/basic/clusters/fixed-3-cephfs.yaml b/suites/fs/basic/clusters/fixed-3-cephfs.yaml
deleted file mode 120000 (symlink)
index a482e65..0000000
--- a/suites/fs/basic/clusters/fixed-3-cephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3-cephfs.yaml
\ No newline at end of file

diff --git a/suites/fs/snaps/clusters/fixed-2-ucephfs.yaml b/suites/fs/snaps/clusters/fixed-2-ucephfs.yaml
new file mode 120000 (symlink)
index 0000000..825c5b9
--- /dev/null
+++ b/suites/fs/snaps/clusters/fixed-2-ucephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2-ucephfs.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
deleted file mode 120000 (symlink)
index a482e65..0000000
--- a/suites/fs/snaps/clusters/fixed-3-cephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3-cephfs.yaml
\ No newline at end of file

diff --git a/suites/fs/traceless/clusters/fixed-2-ucephfs.yaml b/suites/fs/traceless/clusters/fixed-2-ucephfs.yaml
new file mode 120000 (symlink)
index 0000000..825c5b9
--- /dev/null
+++ b/suites/fs/traceless/clusters/fixed-2-ucephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2-ucephfs.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
deleted file mode 120000 (symlink)
index a482e65..0000000
--- a/suites/fs/traceless/clusters/fixed-3-cephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3-cephfs.yaml
\ No newline at end of file

diff --git a/suites/fs/verify/clusters/fixed-2-ucephfs.yaml b/suites/fs/verify/clusters/fixed-2-ucephfs.yaml
new file mode 120000 (symlink)
index 0000000..825c5b9
--- /dev/null
+++ b/suites/fs/verify/clusters/fixed-2-ucephfs.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2-ucephfs.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
deleted file mode 120000 (symlink)
index a482e65..0000000
--- a/suites/fs/verify/clusters/fixed-3-cephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3-cephfs.yaml
\ No newline at end of file