From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 21 Sep 2018 19:46:30 +0000 (-0500)
Subject: purge-cluster: zap devices used with the lvm scenario
X-Git-Tag: v3.2.0beta3~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9747f3dbd5a2eada543a6f61e482e005b6660016;p=ceph-ansible.git

purge-cluster: zap devices used with the lvm scenario

Fixes: https://github.com/ceph/ceph-ansible/issues/3156

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 7e05ee864..7e63b927e 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -350,7 +350,7 @@
     failed_when: false
     register: ceph_lockbox_partition_to_erase_path
 
-  - name: zap and destroy OSDs created by ceph-volume
+  - name: zap and destroy osds created by ceph-volume with lvm_volumes
     ceph_volume:
       data: "{{ item.data }}"
       data_vg: "{{ item.data_vg|default(omit) }}"
@@ -367,6 +367,16 @@
     when:
       - osd_scenario == "lvm"
 
+  - name: zap and destroy osds created by ceph-volume with devices
+    ceph_volume:
+      data: "{{ item }}"
+      action: "zap"
+    environment:
+      CEPH_VOLUME_DEBUG: 1
+    with_items: "{{ devices | default([]) }}"
+    when:
+      - osd_scenario == "lvm"
+
   - name: get ceph block partitions
     shell: |
       blkid -o device -t PARTLABEL="ceph block"