From: Andrew Schoen Date: Wed, 15 Feb 2017 15:53:13 +0000 (-0600) Subject: purge-cluster: also purge dmcrypt dedicated journals X-Git-Tag: v2.2.0rc1~28^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=22f52a9dc68a37e717ce13d8976c32b1aa7fe5cf;p=ceph-ansible.git purge-cluster: also purge dmcrypt dedicated journals See: https://bugzilla.redhat.com/show_bug.cgi?id=1414647 Signed-off-by: Andrew Schoen --- diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 10855627c..f27925834 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -349,9 +349,7 @@ with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines | default([]) }}" when: - ceph_journal_partlabels.rc == 0 - - raw_multi_journal is defined - - raw_multi_journal - + - (raw_multi_journal is defined and raw_multi_journal) or (dmcrypt_dedicated_journal is defined and dmcrypt_dedicated_journal) - name: purge ceph mon cluster