diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index eb544bd79..1e17322a3 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -257,11 +257,6 @@ - reboot_osd_node - remove_osd_mountpoints.failed is defined - - name: see if ceph-disk is installed - shell: "which ceph-disk" - failed_when: false - register: ceph_disk_present - - name: wipe table on dm-crypt devices command: dmsetup wipe_table --force "{{ item }}" with_items: "{{ encrypted_ceph_partuuid.stdout_lines }}" diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index 6dc0ab4d9..74fdc1090 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -361,6 +361,7 @@ CEPH_CONTAINER_BINARY: "{{ container_binary }}" with_items: "{{ lvm_volumes }}" when: lvm_volumes | default([]) | length > 0 + - name: zap and destroy osds created by ceph-volume with devices ceph_volume: data: "{{ item }}"