From: Sage Weil <sage@redhat.com>
Date: Tue, 7 Mar 2017 00:01:12 +0000 (-0500)
Subject: qa/suites/upgrade/jewel-x/parallel: upgrade mons before osds
X-Git-Tag: v11.2.1~3^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b574cb341c9ce0f9d986c79c03951c7c9eafb0b8;p=ceph.git

qa/suites/upgrade/jewel-x/parallel: upgrade mons before osds

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3c80e15c3b34ac2adc4e70f09929e3bc01785594)
---

diff --git a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 3e6f81671dfb4..e18856772b503 100644
--- a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -12,6 +12,11 @@ upgrade-sequence:
        wait-for-healthy: true
    - sleep:
        duration: 60
+   - ceph.restart:
+       daemons: [mon.b, mon.c]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
    - ceph.restart:
        daemons: [osd.0, osd.1]
        wait-for-healthy: true
@@ -25,9 +30,6 @@ upgrade-sequence:
       mon.b:
         - sudo ceph osd crush tunables jewel
    - print: "**** done ceph osd crush tunables jewel"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
    - sleep:
        duration: 60
    - ceph.restart: