upgrade/hammer-x/parallel: upgrade osds first

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
index d62888085bb08b42923f0789e01ab43916fad7d9..b5acf98f94d4528cc20e8cee3289ec5961f3a161 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
@@ -6,10 +6,15 @@ upgrade-sequence:
    - sleep:
        duration: 60
    - ceph.restart:
-       daemons: [mon.a]
+       daemons: [osd.2, osd.3]
        wait-for-healthy: true
    - sleep:
        duration: 60
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+   - sleep:
+       duration: 60
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60
@@ -19,13 +24,11 @@ upgrade-sequence:
       mon.b:
         - sudo ceph osd crush tunables hammer
    - print: "**** done ceph osd crush tunables hammer"
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-   - sleep:
-       duration: 60
    - ceph.restart:
        daemons: [mon.b, mon.c]
        wait-for-healthy: false
+   - sleep:
+       duration: 30
    - exec:
        osd.0:
          - sleep 300 # http://tracker.ceph.com/issues/17808