tests: ceph-disk: modified the destroy_osd test function.

  - use the new implementation (ceph-disk deactivate/destroy) instead of step by step remove

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>

diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py
index a4cb5620a6ce3d767ee1d281afea28480d468da6..53f46128fd6d76aac9202e5ed2eee7151f950f00 100644 (file)
--- a/qa/workunits/ceph-disk/ceph-disk-test.py
+++ b/qa/workunits/ceph-disk/ceph-disk-test.py
@@ -134,10 +134,8 @@ class CephDisk:
         except:
             pass
         self.sh("""
-        ceph osd down {id}
-        ceph osd rm {id}
-        ceph auth del osd.{id}
-        ceph osd crush rm osd.{id}
+        ceph-disk deactivate --deactivate-by-id {id}
+        ceph-disk destroy --destroy-by-id {id}
         """.format(id=id))
 
     @staticmethod