upgrade/hammer-x/f-h-x-offline: osds first

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

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
index 8c9a849d18e2fa40c1ae3d76219852a99df33f72..1b5204eb8334510646873419228c606c0e704a44 100644 (file)
--- a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
+++ b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
@@ -3,6 +3,10 @@ tasks:
 - ceph.stop: [osd.0, osd.1, osd.2]
 - install.upgrade:
     mon.a:
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]
+    wait-for-healthy: false
+    wait-for-osds-up: false
 - ceph.restart:
     daemons: [mon.a, mon.b, mon.c]
     wait-for-healthy: false
@@ -10,9 +14,5 @@ tasks:
 - exec:
     mon.a:
       - ceph osd down 0 1 2
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
-    wait-for-healthy: false
-    wait-for-osds-up: false
 - sleep:
     duration: 10