From: Kefu Chai <kchai@redhat.com>
Date: Wed, 29 Nov 2017 05:37:24 +0000 (+0800)
Subject: qa: disable mon-health-to-clog in upgrade test
X-Git-Tag: v13.0.1~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19233%2Fhead;p=ceph.git

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 466a9208cdd..2ba5bc8e0fe 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
@@ -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 cff3a68366d..5c021bdf130 100644
--- 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 f197de67945..46a1345fb15 100644
--- 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 87fa1d5fa2c..aabfd6d4f82 100644
--- 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"