mirror of https://github.com/ceph/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 <seb@redhat.com>pull/2018/head
parent
f147b119ed
commit
24b82c2679
|
@ -394,7 +394,7 @@
|
||||||
- "{{ ceph_lockbox_partition_to_erase_path.stdout_lines | default([]) }}"
|
- "{{ ceph_lockbox_partition_to_erase_path.stdout_lines | default([]) }}"
|
||||||
when:
|
when:
|
||||||
- ceph_disk_present.rc == 0
|
- 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
|
# this should go away once 'ceph-volume lvm zap' is available
|
||||||
- name: remove osd logical volumes
|
- name: remove osd logical volumes
|
||||||
|
@ -461,7 +461,6 @@
|
||||||
- "{{ ceph_wal_partition_to_erase_path.stdout_lines | default([]) }}"
|
- "{{ ceph_wal_partition_to_erase_path.stdout_lines | default([]) }}"
|
||||||
when:
|
when:
|
||||||
- (ceph_block_partlabels.rc == 0 or ceph_journal_partlabels.rc == 0 or ceph_db_partlabels.rc == 0 or ceph_wal_partlabels.rc == 0)
|
- (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
|
- name: purge ceph mon cluster
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue