From: Sage Weil <sage@redhat.com>
Date: Wed, 1 Mar 2017 19:58:07 +0000 (-0600)
Subject: qa/suites/upgrade/jewel-x/parallel: fix upgrade to luminous
X-Git-Tag: v11.2.1~3^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4eb3c2dbf321cf7a110b2ac7022d5d9cc80b8f3a;p=ceph.git

qa/suites/upgrade/jewel-x/parallel: fix upgrade to luminous

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2e3ea53b41cacc4b4bbc4ffe7342fb00233009cf)

Conflicts:
   4-kraken.yaml (do not delete)
   4-luminous.yaml (do not add)
---

diff --git a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 02cba21c2c8..6a0f82986b1 100644
--- a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -4,12 +4,9 @@ meta:
 upgrade-sequence:
    sequential:
    - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+       daemons: [mon.a, mon.b, mon.c]
+   - ceph.restart:
+       daemons: [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"