upgrade/jewel-x: fix require_kraken_osds flag

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

diff --git a/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 2e41f7354c1de7dafdb56cd87d46cdbafb2a9a7e..02cba21c2c85653e5902261ff9ccda1db3c4b1f7 100644 (file)
--- a/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -3,5 +3,13 @@ meta:
    upgrade the ceph cluster
 upgrade-sequence:
    sequential:
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+   - ceph.restart:
+       daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - exec:
+       mon.a:
+         - ceph osd set require_kraken_osds
+   - ceph.restart:
+       daemons: [osd.0]
    - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 43f393767930d62a7b81a955aa897940f9a978c7..3e6f81671dfb4b25a3c91d861b0828640d7e7d9d 100644 (file)
--- a/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -32,6 +32,11 @@ upgrade-sequence:
        duration: 60
    - ceph.restart:
        daemons: [osd.2, osd.3]
-       wait-for-healthy: true
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - exec:
+       mon.a:
+         - ceph osd set require_kraken_osds
+   - ceph.restart: [osd.3]
    - sleep:
        duration: 60

diff --git a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index 61c87631826f7b9b4c6c2f7823da8392bef5ac44..3db6cbf742c48cc20ca34fc88c0bca24be2ebbf9 100644 (file)
--- a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -174,6 +174,15 @@ workload_x:
 upgrade-sequence_x:
    sequential:
    - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
    - sleep:
        duration: 60
    - ceph.restart: [osd.0]
@@ -191,16 +200,13 @@ upgrade-sequence_x:
    - ceph.restart: [osd.4]
    - sleep:
        duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
+   - ceph.restart:
+       daemons: [osd.5]
+       wait-for-healthy: false
+       wait-for-up-osds: true
+   - exec:
+       mon.a:
+         - ceph osd set require_kraken_osds
    - sleep:
        duration: 60
    - print: "**** done ceph.restart all -x branch mds/osd/mon"