Merge pull request #369 from ceph/remove-zap

Remove the disk zap function

roles/ceph-osd/tasks/scenarios/journal_collocation.yml

@@ -2,7 +2,6 @@
 ## SCENARIO 1: JOURNAL AND OSD_DATA ON THE SAME DEVICE
 
 - include: ../check_devices.yml
-- include: ../zap_devices.yml
 
 # NOTE (leseb): the prepare process must be parallelized somehow...
 # if you have 64 disks with 4TB each, this will take a while

roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml

@@ -2,7 +2,6 @@
 ## SCENARIO 3: N JOURNAL DEVICES FOR N OSDS
 
 - include: ../check_devices.yml
-- include: ../zap_devices.yml
 
 # NOTE (leseb): the prepare process must be parallelized somehow...
 # if you have 64 disks with 4TB each, this will take a while

roles/ceph-osd/tasks/zap_devices.yml

@@ -1,29 +0,0 @@
----
-# NOTE (leseb): some devices might miss partition label which which will result
-# in ceph-disk failing to prepare OSD. Thus zapping them prior to prepare the OSD
-# ensures that the device will get successfully prepared.
-- name: erasing partitions and labels from osd disk(s)
-  command: ceph-disk zap {{ item.2 }}
-  changed_when: false
-  with_together:
-    - parted.results
-    - ispartition.results
-    - devices
-  when:
-    item.0.rc != 0 and
-    item.1.rc != 0 and
-    zap_devices and
-    (journal_collocation or raw_multi_journal)
-
-- name: erasing partitions and labels from the journal device(s)
-  command: ceph-disk zap {{ item.2 }}
-  changed_when: false
-  with_together:
-    - parted.results
-    - ispartition.results
-    - raw_journal_devices
-  when:
-    item.0.rc != 0 and
-    item.1.rc != 0 and
-    zap_devices and
-    raw_multi_journal