From 24b82c2679d578c4580677d316cccbcdeb3cf026 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 10 Oct 2017 09:57:39 +0200 Subject: [PATCH] purge: fix journal purge MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- infrastructure-playbooks/purge-cluster.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 -- 2.39.5