From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 8 Jun 2017 16:55:38 +0000 (+0200)
Subject: tests: ceph-helper uses ceph osd purge
X-Git-Tag: ses5-milestone9~1^2~6^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1902a414f34389fd08bc79c6dc2ac2960accd8f7;p=ceph.git

tests: ceph-helper uses ceph osd purge

Instead of removing each element related to an OSD individually.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
index 7b61d3684391..f293d7f043ea 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
 }