From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Dec 2018 18:48:09 +0000 (-0600)
Subject: qa/suites/rados/upgrade: spread mons a bit
X-Git-Tag: v14.1.0~484^2~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1493f0d9a34078f63ce6b13d801cd2d6d8424c0;p=ceph.git

qa/suites/rados/upgrade: spread mons a bit

This will mean 2/3 mons have default ports.

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

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
index 24f8ca0bd7df..c300685823a7 100644
--- a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
@@ -13,7 +13,6 @@ overrides:
         ms dump corrupt message level: 0
 roles:
 - - mon.a
-  - mon.b
   - mon.c
   - mgr.x
   - mgr.y
@@ -21,7 +20,8 @@ roles:
   - osd.0
   - osd.1
   - osd.2
-- - osd.3
+- - mon.b
+  - osd.3
   - osd.4
   - osd.5
 - - client.0
diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml
index 2ba5bc8e0fe5..51f32ccc13dd 100644
--- a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml
@@ -8,7 +8,7 @@ tasks:
     osd.0:
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
-    daemons: [mon.a, mon.b, mon.c]
+    daemons: [mon.a, mon.c]
     wait-for-healthy: false
     mon-health-to-clog: false
 - ceph.restart:
diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
index a1108158c80f..a03c8d8149cb 100644
--- a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
@@ -11,6 +11,10 @@ overrides:
 tasks:
 - install.upgrade:
     osd.3:
+- ceph.restart:
+    daemons: [mon.b]
+    wait-for-up: true
+    wait-for-healthy: false
 - ceph.restart:
     daemons: [osd.3, osd.4, osd.5]
     wait-for-up: true