From f9a3afddeb669a24141f3771a0b7bd252956c680 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 24 Nov 2014 20:55:29 -0800 Subject: [PATCH] Revert "fix mon restart in firefly upgrade tests" --- .../3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 12 +++--------- .../3-upgrade-sequence/upgrade-osd-mon-mds.yaml | 12 +++--------- .../3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) 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 395be9a15a8b5..32f2314f736d3 100644 --- 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,19 +5,13 @@ upgrade-sequence: branch: firefly mon.b: branch: firefly - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: false + - ceph.restart: [mon.a] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.b] - wait-for-healthy: false + - ceph.restart: [mon.b] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.c] - wait-for-healthy: false + - ceph.restart: [mon.c] - 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 49a9559e69b31..7a3dbe51e3f33 100644 --- 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,19 +23,13 @@ upgrade-sequence: - ceph.restart: [osd.5] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: false + - ceph.restart: [mon.a] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.b] - wait-for-healthy: false + - ceph.restart: [mon.b] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.c] - wait-for-healthy: false + - ceph.restart: [mon.c] - 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 cb606a545129b..120de5cca8e30 100644 --- 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,19 +5,13 @@ upgrade-sequence: branch: firefly mon.b: branch: firefly - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: true + - ceph.restart: [mon.a] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.b] - wait-for-healthy: true + - ceph.restart: [mon.b] - sleep: duration: 60 - - ceph.restart: - daemons: [mon.c] - wait-for-healthy: true + - ceph.restart: [mon.c] - sleep: duration: 60 - ceph.restart: [osd.0] -- 2.39.5