From 1902a414f34389fd08bc79c6dc2ac2960accd8f7 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 8 Jun 2017 18:55:38 +0200 Subject: [PATCH] tests: ceph-helper uses ceph osd purge Instead of removing each element related to an OSD individually. Signed-off-by: Loic Dachary --- qa/workunits/ceph-helpers.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh index 7b61d36843916..f293d7f043eaf 100755 --- a/qa/workunits/ceph-helpers.sh +++ b/qa/workunits/ceph-helpers.sh @@ -590,11 +590,9 @@ function destroy_osd() { local dir=$1 local id=$2 - kill_daemons $dir TERM osd.$id || return 1 ceph osd out osd.$id || return 1 - ceph auth del osd.$id || return 1 - ceph osd crush remove osd.$id || return 1 - ceph osd rm $id || return 1 + kill_daemons $dir TERM osd.$id || return 1 + ceph osd purge osd.$id --yes-i-really-mean-it || return 1 teardown $dir/$id || return 1 rm -fr $dir/$id } -- 2.39.5