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 32f2314f736d340ced98ceae870d1c082bf45dd2..395be9a15a8b5b56d5d3d3c686805c9a12164c54 100644 (file)
--- 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 7a3dbe51e3f33d10813cb01205e9f0fab973f84f..49a9559e69b31467c104d0b441a7ad6148a3bb64 100644 (file)
--- 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 120de5cca8e303cc2e8519aa120dc015799d79f3..cb606a545129bc6979b2a5769fd2def19f2e51e9 100644 (file)
--- 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]