From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 11 Apr 2019 15:03:44 +0000 (+0200)
Subject: purge: remove references to ceph-disk
X-Git-Tag: v5.0.0alpha1~405
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a1254d767ce6430ce017ca9d54b4a57390834c43;p=ceph-ansible.git

purge: remove references to ceph-disk

as of stable-4.0, ceph-disk is no longer supported.
These tasks aren't needed anymore.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

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 }}"