From b4db5e4ffcf0fb345c99986718b16853f76b148a Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 6 Nov 2023 11:19:09 -0500 Subject: [PATCH] qa/cephadm: adjust host drain test to handle explicit placement warning Since we're adding a warning if any host is listed explicitly in the placement of any service when removing the host, we need to adjust the host drain test that removes a host without the --force flag to not have the explicit hostname in the placement for the mon service. Signed-off-by: Adam King --- .../orch/cephadm/workunits/task/test_host_drain.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml index 83173c9f8b2..c195bc052b7 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml @@ -28,6 +28,16 @@ tasks: HOST_C="${host}" fi done + # One last thing to worry about before draining the host + # is that the teuthology test tends to put the explicit + # hostnames in the placement for the mon service. + # We want to make sure we can drain without providing + # --force and there is a check for the host being removed + # being listed explicitly in the placements. Therefore, + # we should remove it from the mon placement. + ceph orch ls mon --export > mon.yaml + sed /"$HOST_C"/d mon.yaml > mon_adjusted.yaml + ceph orch apply -i mon_adjusted.yaml # now drain that host ceph orch host drain $HOST_C --zap-osd-devices # wait for drain to complete