From 7a89787cde24fafd7efc27822742b401f8f21c39 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 16 Jan 2019 17:27:37 -0600
Subject: [PATCH] qa/suites/rados/upgrade: one mon per node, and enable-msgr2
 at end

Signed-off-by: Sage Weil <sage@redhat.com>
---
 .../luminous-x-singleton/0-cluster/start.yaml     | 15 ++++++++++-----
 .../2-partial-upgrade/firsthalf.yaml              |  9 +++++----
 .../luminous-x-singleton/6-finish-upgrade.yaml    |  9 ++++++---
 3 files changed, 21 insertions(+), 12 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 308e1c60b23e9..3c65ea9ccc5d6 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
@@ -7,26 +7,31 @@ overrides:
   ceph:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
-    log-whitelist:
-      - \(MON_MSGR2_NOT_ENABLED\)
     fs: xfs
     conf:
       global:
         ms dump corrupt message level: 0
+        ms bind msgr2: false
       mds:
         debug ms: 1
         debug mds: 20
 roles:
 - - mon.a
-  - mon.c
   - mgr.x
-  - mgr.y
   - mds.a
   - osd.0
   - osd.1
   - osd.2
-- - mon.b
   - osd.3
+- - mon.b
   - osd.4
   - osd.5
+  - osd.6
+  - osd.7
+- - mon.c
+  - mgr.y
+  - osd.8
+  - osd.9
+  - osd.10
+  - osd.11
 - - 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 51f32ccc13ddb..a6cf4a460948c 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
@@ -5,13 +5,14 @@ meta:
    restart : osd.0,1,2,3,4,5
 tasks:
 - install.upgrade:
-    osd.0:
+    mon.a:
+    mon.b:
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
-    daemons: [mon.a, mon.c]
+    daemons: [mon.a, mon.b]
     wait-for-healthy: false
     mon-health-to-clog: false
 - ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
+    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7]
     wait-for-healthy: false
-- print: "**** done ceph.restart 1st half"
+- print: "**** done ceph.restart 1st 2/3s"
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 bd917f24f9039..e7fa4b2f47c6f 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
@@ -10,18 +10,21 @@ overrides:
       - \(MDS_
 tasks:
 - install.upgrade:
-    osd.3:
+    mon.c:
 - ceph.restart:
-    daemons: [mon.b, mgr.x, mgr.y]
+    daemons: [mon.c, mgr.x, mgr.y]
     wait-for-up: true
     wait-for-healthy: false
 - ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
+    daemons: [osd.8, osd.9, osd.10, osd.11]
     wait-for-up: true
     wait-for-healthy: false
 - ceph.restart:
     daemons: [mds.a]
     wait-for-up: true
     wait-for-healthy: false
+- exec:
+    mon.a:
+      - ceph mon enable-msgr2
 - install.upgrade:
     client.0:
-- 
2.39.5