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 <[email protected]>
mitsu-ko · Nov 17, 2015 · 06aeec9 · 06aeec9
1 parent 7922041
commit 06aeec9
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py
@@ -134,10 +134,8 @@ def destroy_osd(self, uuid):
         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