qa: disable mon-health-to-clog in upgrade test

otherwise the cluster will complain that the quorum size is smaller than
that of monmap.

Signed-off-by: Kefu Chai <kchai@redhat.com>

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 466a9208cdde9aad8b08072487ee10e6f28752b2..2ba5bc8e0fe5a7f0cdc34ed9efb0d23ad72a61d0 100644 (file)
--- 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
@@ -10,6 +10,7 @@ tasks:
 - ceph.restart:
     daemons: [mon.a, mon.b, mon.c]
     wait-for-healthy: false
+    mon-health-to-clog: false
 - ceph.restart:
     daemons: [osd.0, osd.1, osd.2]
     wait-for-healthy: false

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index cff3a68366d1b88766f01ea23373eeb788113a73..5c021bdf130743dc919759e1509b935a9f0991d7 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -5,6 +5,7 @@ upgrade-sequence:
    sequential:
    - ceph.restart:
        daemons: [mon.a, mon.b, mon.c, mgr.x]
+       mon-health-to-clog: false
    - ceph.restart:
        daemons: [osd.0, osd.1, osd.2, osd.3]
        wait-for-healthy: false

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index f197de67945c441883fdf3d840b3460dc32c177c..46a1345fb15400df3009deb178f1da977bf54330 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -15,6 +15,7 @@ upgrade-sequence:
    - ceph.restart:
        daemons: [mon.b, mon.c, mgr.x]
        wait-for-healthy: true
+       mon-health-to-clog: false
    - sleep:
        duration: 60
    - ceph.restart:

diff --git a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
index 87fa1d5fa2c32df4e43029cfcc3e29263f097b0f..aabfd6d4f82269a9906bf06d65fe1fbc960e0c96 100644 (file)
--- a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
+++ b/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
@@ -9,4 +9,5 @@ tasks:
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
     daemons: [mon.a,mon.b,mon.c,mgr.x,osd.0,osd.1,osd.2]
+    mon-health-to-clog: false
 - print: "**** done ceph.restart 1st half"