From b1493f0d9a34078f63ce6b13d801cd2d6d8424c0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Dec 2018 12:48:09 -0600
Subject: [PATCH] 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>
---
 .../rados/upgrade/luminous-x-singleton/0-cluster/start.yaml   | 4 ++--
 .../luminous-x-singleton/2-partial-upgrade/firsthalf.yaml     | 2 +-
 .../rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml  | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

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 24f8ca0bd7d..c300685823a 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 2ba5bc8e0fe..51f32ccc13d 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 a1108158c80..a03c8d8149c 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