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 (symlink)
index 0000000..cd0791a
--- /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 (symlink)
index a3ac9fc..0000000
--- 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 (file)
index 294c2e0..0000000
--- 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 (symlink)
index 0000000..cd0791a
--- /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 (file)
index 294c2e0..0000000
--- 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 (symlink)
index 0000000..cd0791a
--- /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 (symlink)
index 0000000..cd0791a
--- /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 (symlink)
index a3ac9fc..0000000
--- a/suites/rados/verify/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file