From 68248a266b5e5aa4135318bb710ee886c0c78924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 6 Aug 2015 17:24:21 +0200 Subject: [PATCH] Remove the disk zap function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will likely one day or another break something. If ceph-disk complains about a disk just use the purge-cluster.yml playbook first as it will wipe all the devices. Signed-off-by: Sébastien Han --- .../tasks/scenarios/journal_collocation.yml | 1 - .../tasks/scenarios/raw_multi_journal.yml | 1 - roles/ceph-osd/tasks/zap_devices.yml | 29 ------------------- 3 files changed, 31 deletions(-) delete mode 100644 roles/ceph-osd/tasks/zap_devices.yml diff --git a/roles/ceph-osd/tasks/scenarios/journal_collocation.yml b/roles/ceph-osd/tasks/scenarios/journal_collocation.yml index 6a425c4e1..a748ebc59 100644 --- a/roles/ceph-osd/tasks/scenarios/journal_collocation.yml +++ b/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 diff --git a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml index 2d00bae01..4a384f186 100644 --- a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml +++ b/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 diff --git a/roles/ceph-osd/tasks/zap_devices.yml b/roles/ceph-osd/tasks/zap_devices.yml deleted file mode 100644 index 34bbc90bc..000000000 --- a/roles/ceph-osd/tasks/zap_devices.yml +++ /dev/null @@ -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