From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Dec 2018 14:51:32 +0000 (-0600)
Subject: qa/rados/thrash-old-clients: keep mons on separate hosts
X-Git-Tag: v14.1.0~484^2~62
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fbdc1358e694d01ab4d1f8655897f22306405370;p=ceph-ci.git

qa/rados/thrash-old-clients: keep mons on separate hosts

This ensures the mons can use default ports, ceph.conf won't have v1: or
v2: prefixes, and old clients will be happy.

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

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index bfa122b138d..ef6d381c91b 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -15,3 +15,4 @@ tasks:
 - install.upgrade:
     mon.a:
     mon.b:
+    mon.c:
diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index 755b5da9dbc..0238b4636fa 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -6,3 +6,4 @@ tasks:
 - install.upgrade:
     mon.a:
     mon.b:
+    mon.c:
diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index 686001ee871..6bd72a0fc06 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -6,3 +6,4 @@ tasks:
 - install.upgrade:
     mon.a:
     mon.b:
+    mon.c:
diff --git a/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml b/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml
new file mode 100644
index 00000000000..35cfc3c1ff6
--- /dev/null
+++ b/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml
@@ -0,0 +1,14 @@
+roles:
+- [mon.a, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0]
+- [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1]
+- [mon.c, osd.8, osd.9, osd.10, osd.11]
+- [client.2]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
diff --git a/qa/suites/rados/thrash-old-clients/clusters/two-plus-three.yaml b/qa/suites/rados/thrash-old-clients/clusters/two-plus-three.yaml
deleted file mode 100644
index fc86b982d2e..00000000000
--- a/qa/suites/rados/thrash-old-clients/clusters/two-plus-three.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-roles:
-- [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0]
-- [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1]
-- [client.2]
-openstack:
-- volumes: # attached to each instance
-    count: 4
-    size: 10 # GB
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true