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 <seb@redhat.com>

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 41589f8d15c7a6126db9568aec5eb1a0528bd8a0..fe2823815df9b8d3f2a53a7c71f71413ed71b928 100644 (file)
--- 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