From: Sébastien Han Date: Tue, 10 Oct 2017 07:57:39 +0000 (+0200) Subject: purge: fix journal purge X-Git-Tag: v3.0.0~2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2018%2Fhead;p=ceph-ansible.git purge: fix journal purge Using a condition when osd_scenario == 'non-collocated' was wrong since these partitions can be collocated on a single device also. Removing the check makes the purge of these partitions. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1499871 Signed-off-by: Sébastien Han --- diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 41589f8d1..fe2823815 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -394,7 +394,7 @@ - "{{ ceph_lockbox_partition_to_erase_path.stdout_lines | default([]) }}" when: - ceph_disk_present.rc == 0 - - ceph_data_partlabels.rc == 0 + - (ceph_data_partlabels.rc == 0 or ceph_lockbox_partlabels.rc == 0) # this should go away once 'ceph-volume lvm zap' is available - name: remove osd logical volumes @@ -461,7 +461,6 @@ - "{{ ceph_wal_partition_to_erase_path.stdout_lines | default([]) }}" when: - (ceph_block_partlabels.rc == 0 or ceph_journal_partlabels.rc == 0 or ceph_db_partlabels.rc == 0 or ceph_wal_partlabels.rc == 0) - - osd_scenario == 'non-collocated' - name: purge ceph mon cluster