Merge pull request #1311 from ceph/BZ-1414647

purge-cluster: also purge dmcrypt dedicated journals
pull/1313/head
Andrew Schoen 2017-02-15 11:57:09 -06:00 committed by GitHub
commit a81b40eb6f
1 changed files with 1 additions and 3 deletions

View File

@ -349,9 +349,7 @@
with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines | default([]) }}" with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines | default([]) }}"
when: when:
- ceph_journal_partlabels.rc == 0 - ceph_journal_partlabels.rc == 0
- raw_multi_journal is defined - (raw_multi_journal is defined and raw_multi_journal) or (dmcrypt_dedicated_journal is defined and dmcrypt_dedicated_journal)
- raw_multi_journal
- name: purge ceph mon cluster - name: purge ceph mon cluster