From: Andrew Schoen Date: Thu, 26 Jan 2017 18:07:42 +0000 (-0600) Subject: purge-cluster: fix failure when raw_multi_journal is not defined X-Git-Tag: v2.2.0rc1~53^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d3cb8dba4e05f2081051855949b8ec5de34b19f0;p=ceph-ansible.git purge-cluster: fix failure when raw_multi_journal is not defined Because the purge-cluster.yml playbook does not have access to the roles default vars then we can be sure that raw_multi_journal is defined. For example, if this was purging a dmcrypt journal then raw_multi_journal might not be defined at all in group_vars/all.yml or group_vars/osds.yml. Signed-off-by: Andrew Schoen --- diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 133d25fef..70a3893dd 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -439,6 +439,7 @@ with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines }}" when: - ceph_journal_partlabels.rc == 0 + - raw_multi_journal is defined - raw_multi_journal