From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Nov 2014 19:19:55 +0000 (-0800)
Subject: upgrade/firefly: do not wait for clean when restarting mons
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca66f591e43ea260d24f7a10c16304cf2268d587;p=ceph.git

upgrade/firefly: do not wait for clean when restarting mons

This may fail is the quorum features to not match.

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

diff --git a/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 32f2314f736d..395be9a15a8b 100644
--- a/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -5,13 +5,19 @@ upgrade-sequence:
          branch: firefly
       mon.b:
          branch: firefly
-   - ceph.restart: [mon.a]
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
    - sleep:
        duration: 60
-   - ceph.restart: [mon.b]
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
    - sleep:
        duration: 60
-   - ceph.restart: [mon.c]
+   - ceph.restart:
+       daemons: [mon.c]
+       wait-for-healthy: false
    - sleep:
        duration: 60
    - ceph.restart: [osd.0]
diff --git a/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 7a3dbe51e3f3..49a9559e69b3 100644
--- a/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade/firefly/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -23,13 +23,19 @@ upgrade-sequence:
    - ceph.restart: [osd.5]
    - sleep:
        duration: 60
-   - ceph.restart: [mon.a]
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
    - sleep:
        duration: 60
-   - ceph.restart: [mon.b]
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
    - sleep:
        duration: 60
-   - ceph.restart: [mon.c]
+   - ceph.restart:
+       daemons: [mon.c]
+       wait-for-healthy: false
    - sleep:
        duration: 60
    - ceph.restart: [mds.a]
diff --git a/suites/upgrade/firefly/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 120de5cca8e3..cb606a545129 100644
--- a/suites/upgrade/firefly/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/firefly/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -5,13 +5,19 @@ upgrade-sequence:
          branch: firefly
       mon.b:
          branch: firefly
-   - ceph.restart: [mon.a]
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: true
    - sleep:
        duration: 60
-   - ceph.restart: [mon.b]
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: true
    - sleep:
        duration: 60
-   - ceph.restart: [mon.c]
+   - ceph.restart:
+       daemons: [mon.c]
+       wait-for-healthy: true
    - sleep:
        duration: 60
    - ceph.restart: [osd.0]