From 0f41bbfc76d1ae0448725323550d3df690e4965c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 14 Nov 2016 18:13:04 -0500 Subject: [PATCH] upgrade/hammer-x: osds first Signed-off-by: Sage Weil --- .../parallel/3-upgrade-sequence/upgrade-all.yaml | 6 +++++- ...upgrade-mon-osd-mds.yaml => upgrade-osd-mds-mon.yaml} | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) rename suites/upgrade/hammer-x/parallel/3-upgrade-sequence/{upgrade-mon-osd-mds.yaml => upgrade-osd-mds-mon.yaml} (96%) diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 6bf8f4a3ad8d5..ec1a88c767cf7 100644 --- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -1,7 +1,11 @@ upgrade-sequence: sequential: - ceph.restart: - daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] + daemons: [osd.0, osd.1, osd.2, osd.3] + wait-for-healthy: false + wait-for-osds-up: true + - ceph.restart: + daemons: [mon.a, mon.b, mon.c] wait-for-healthy: false wait-for-osds-up: true - print: "**** done ceph.restart do not wait for healthy" diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml similarity index 96% rename from suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml rename to suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml index 3a63c002bd63f..d62888085bb08 100644 --- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml @@ -1,12 +1,12 @@ upgrade-sequence: sequential: - ceph.restart: - daemons: [mon.a] + daemons: [osd.0, osd.1] wait-for-healthy: true - sleep: duration: 60 - ceph.restart: - daemons: [osd.0, osd.1] + daemons: [mon.a] wait-for-healthy: true - sleep: duration: 60 @@ -20,12 +20,11 @@ upgrade-sequence: - sudo ceph osd crush tunables hammer - print: "**** done ceph osd crush tunables hammer" - ceph.restart: - daemons: [mon.b, mon.c] - wait-for-healthy: true + daemons: [osd.2, osd.3] - sleep: duration: 60 - ceph.restart: - daemons: [osd.2, osd.3] + daemons: [mon.b, mon.c] wait-for-healthy: false - exec: osd.0: -- 2.39.5