From: Sage Weil <sage@inktank.com>
Date: Mon, 18 Feb 2013 21:24:18 +0000 (-0800)
Subject: rados: use 2 instead of 3 machines
X-Git-Tag: v0.94.10~27^2^2~800
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f05f90b527b915ca53ae69048a01f6b0adc0cf4b;p=ceph.git

rados: use 2 instead of 3 machines

Put the client on the same node as some of the osds.  This shouldn't cause
any problems.  It will make timing a bit different, but if anything that
is probably a good thing.

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

diff --git a/suites/rados/basic/clusters/fixed-2.yaml b/suites/rados/basic/clusters/fixed-2.yaml
new file mode 120000
index 000000000000..cd0791a14861
--- /dev/null
+++ b/suites/rados/basic/clusters/fixed-2.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2.yaml
\ No newline at end of file
diff --git a/suites/rados/basic/clusters/fixed-3.yaml b/suites/rados/basic/clusters/fixed-3.yaml
deleted file mode 120000
index a3ac9fc4dec2..000000000000
--- a/suites/rados/basic/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file
diff --git a/suites/rados/monthrash/clusters/6-osd-3-machine.yaml b/suites/rados/monthrash/clusters/6-osd-3-machine.yaml
deleted file mode 100644
index 294c2e08b094..000000000000
--- a/suites/rados/monthrash/clusters/6-osd-3-machine.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.b, osd.0, osd.1, osd.2]
-- [mon.c, mds.a, osd.3, osd.4, osd.5]
-- [client.0]
diff --git a/suites/rados/monthrash/clusters/fixed-2.yaml b/suites/rados/monthrash/clusters/fixed-2.yaml
new file mode 120000
index 000000000000..cd0791a14861
--- /dev/null
+++ b/suites/rados/monthrash/clusters/fixed-2.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2.yaml
\ No newline at end of file
diff --git a/suites/rados/thrash/clusters/6-osd-3-machine.yaml b/suites/rados/thrash/clusters/6-osd-3-machine.yaml
deleted file mode 100644
index 294c2e08b094..000000000000
--- a/suites/rados/thrash/clusters/6-osd-3-machine.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.b, osd.0, osd.1, osd.2]
-- [mon.c, mds.a, osd.3, osd.4, osd.5]
-- [client.0]
diff --git a/suites/rados/thrash/clusters/fixed-2.yaml b/suites/rados/thrash/clusters/fixed-2.yaml
new file mode 120000
index 000000000000..cd0791a14861
--- /dev/null
+++ b/suites/rados/thrash/clusters/fixed-2.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2.yaml
\ No newline at end of file
diff --git a/suites/rados/verify/clusters/fixed-2.yaml b/suites/rados/verify/clusters/fixed-2.yaml
new file mode 120000
index 000000000000..cd0791a14861
--- /dev/null
+++ b/suites/rados/verify/clusters/fixed-2.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2.yaml
\ No newline at end of file
diff --git a/suites/rados/verify/clusters/fixed-3.yaml b/suites/rados/verify/clusters/fixed-3.yaml
deleted file mode 120000
index a3ac9fc4dec2..000000000000
--- a/suites/rados/verify/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file