From: Sage Weil <sage@inktank.com>
Date: Mon, 18 Feb 2013 21:37:29 +0000 (-0800)
Subject: rbd: use 2 node cluster, mostly.
X-Git-Tag: v0.94.10~27^2^2~798
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c68f687c80827c4ea27f47c12b6b49d5080fe9d1;p=ceph.git

rbd: use 2 node cluster, mostly.

Not for the collection that includes KVM tests.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/clusters/fixed-1.yaml b/clusters/fixed-1.yaml
new file mode 100644
index 00000000000..5f3a8f99233
--- /dev/null
+++ b/clusters/fixed-1.yaml
@@ -0,0 +1,2 @@
+roles:
+- [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, client.0]
diff --git a/suites/rbd/basic/clusters/fixed-1.yaml b/suites/rbd/basic/clusters/fixed-1.yaml
new file mode 120000
index 00000000000..435ea3c7546
--- /dev/null
+++ b/suites/rbd/basic/clusters/fixed-1.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-1.yaml
\ No newline at end of file
diff --git a/suites/rbd/basic/clusters/fixed-3.yaml b/suites/rbd/basic/clusters/fixed-3.yaml
deleted file mode 120000
index a3ac9fc4dec..00000000000
--- a/suites/rbd/basic/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file
diff --git a/suites/rbd/librbd/clusters b/suites/rbd/librbd/clusters
deleted file mode 120000
index 2be59c6e931..00000000000
--- a/suites/rbd/librbd/clusters
+++ /dev/null
@@ -1 +0,0 @@
-../basic/clusters/
\ No newline at end of file
diff --git a/suites/rbd/librbd/clusters/fixed-3.yaml b/suites/rbd/librbd/clusters/fixed-3.yaml
new file mode 120000
index 00000000000..a3ac9fc4dec
--- /dev/null
+++ b/suites/rbd/librbd/clusters/fixed-3.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3.yaml
\ No newline at end of file
diff --git a/suites/rbd/thrash/clusters/6-osd-3-machine.yaml b/suites/rbd/thrash/clusters/6-osd-3-machine.yaml
deleted file mode 100644
index f6247ebf2f3..00000000000
--- a/suites/rbd/thrash/clusters/6-osd-3-machine.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, osd.2]
-- [mds.a, osd.3, osd.4, osd.5]
-- [client.0]
diff --git a/suites/rbd/thrash/clusters/fixed-2.yaml b/suites/rbd/thrash/clusters/fixed-2.yaml
new file mode 120000
index 00000000000..cd0791a1486
--- /dev/null
+++ b/suites/rbd/thrash/clusters/fixed-2.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2.yaml
\ No newline at end of file