]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-cluster: also purge dmcrypt dedicated journals 1311/head
authorAndrew Schoen <aschoen@redhat.com>
Wed, 15 Feb 2017 15:53:13 +0000 (09:53 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 15 Feb 2017 16:27:17 +0000 (10:27 -0600)
See: https://bugzilla.redhat.com/show_bug.cgi?id=1414647

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
infrastructure-playbooks/purge-cluster.yml

index 10855627cb737d0e7e9603cb5b9cea088674e3d6..f27925834afee54e90fb73627595205c3c79edbe 100644 (file)
     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