From b559801e99ce46b34b2940ec2edc441083eaf38c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Oct 2016 13:59:28 -0400 Subject: [PATCH] rados: fix require_kraken_osds flag Signed-off-by: Sage Weil --- .../rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml | 6 +++++- .../singleton-nomsgr/all/lfn-upgrade-infernalis.yaml | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml index 895c26d49a4..204efb03e0f 100644 --- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml +++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml @@ -69,10 +69,14 @@ tasks: name_length: [400, 800, 1600] - install.upgrade: mon.a: null - - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1] + - ceph.restart: + daemons: [mon.a, mon.b, mon.c] + wait-for-healthy: false - exec: mon.a: - ceph osd set require_kraken_osds + - ceph.restart: + daemons: [osd.0, osd.1] - ceph_manager.wait_for_clean: null - ceph_manager.do_pg_scrub: args: ['test', 0, 'scrub'] diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml index 2b2cfd0ab07..406a213baf2 100644 --- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml +++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml @@ -69,7 +69,14 @@ tasks: name_length: [400, 800, 1600] - install.upgrade: mon.a: null - - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1] + - ceph.restart: + daemons: [mon.a, mon.b, mon.c] + wait-for-healthy: false + - exec: + mon.a: + - ceph osd set require_kraken_osds + - ceph.restart: + daemons: [osd.0, osd.1] - exec: mon.a: - ceph osd set require_kraken_osds -- 2.39.5