]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-cluster: also purge dmcrypt dedicated journals 1312/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 17:57:56 +0000 (11:57 -0600)
See: https://bugzilla.redhat.com/show_bug.cgi?id=1414647

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 22f52a9dc68a37e717ce13d8976c32b1aa7fe5cf)

infrastructure-playbooks/purge-cluster.yml

index 0c1b6e8394676f695d818b8fdc108c396358f440..884d30c0f236f0e55e45bfb8269cfca4fdf2d2ed 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