From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 12 May 2015 23:52:28 +0000 (-0700)
Subject: suites/fs: use a two-node layout for most userspace tests
X-Git-Tag: v10.2.6~165^2^2~464^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd2fa897c6d3a51ea6aa685ab06b300186b2242e;p=ceph.git

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
index 000000000000..b1d8678b165c
--- /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
index 000000000000..825c5b97e67b
--- /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
index a482e6504214..000000000000
--- 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
index 000000000000..825c5b97e67b
--- /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
index a482e6504214..000000000000
--- 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
index 000000000000..825c5b97e67b
--- /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
index a482e6504214..000000000000
--- 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
index 000000000000..825c5b97e67b
--- /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
index a482e6504214..000000000000
--- 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