upgrade-parallel/rados: fix mon restarts

diff --git a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index 1db15d0d2d15b46ecebaebd6b87dd85028e93e9e..e8dea7928523a5ef925df690cfc56e236c53438c 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -6,10 +6,16 @@ upgrade-sequence:
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60
-   - ceph.restart: [mon.a]
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
    - sleep:
        duration: 60
-   - ceph.restart: [mon.b]
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
    - sleep:
        duration: 60
    - ceph.restart: [mon.c]

diff --git a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index b660fd833c05ed485ff94d486fc8b593f4166f5a..f9688c8375b1ba47599af751a754429d275dc8e0 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -3,10 +3,16 @@ upgrade-sequence:
    - install.upgrade:
       all:
          branch: next
-   - ceph.restart: [mon.a]
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
    - sleep:
        duration: 60
-   - ceph.restart: [mon.b]
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
    - sleep:
        duration: 60
    - ceph.restart: [mon.c]

diff --git a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index a78f2549a1ed239efa6da6152721f26d6db9733e..91e607bf807b0253ae7c93ef0593235291e29f9d 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -15,10 +15,16 @@ upgrade-sequence:
    - ceph.restart: [osd.3]
    - sleep:
        duration: 60
-   - ceph.restart: [mon.a]
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
    - sleep:
        duration: 60
-   - ceph.restart: [mon.b]
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
    - sleep:
        duration: 60
    - ceph.restart: [mon.c]