From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 25 May 2017 12:30:25 +0000 (-0500)
Subject: purge-docker-cluster: default raw_journal_devices to []
X-Git-Tag: v2.3.0rc2~42^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e322d4825a0c53ae260faa3324eef4dfd0b28b0;p=ceph-ansible.git

purge-docker-cluster: default raw_journal_devices to []

If we're purging a containerized cluster that did not use the
raw_multi_journal OSD scenario then raw_journal_devices will not be
defined which causes the playbook to fail.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1455187

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 0f0a47452..110428779 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -249,7 +249,7 @@
       zap_device
     with_items:
       - "{{ ceph_osd_docker_devices }}"
-      - "{{ raw_journal_devices }}"
+      - "{{ raw_journal_devices|default([]) }}"
 
   - name: wait until the zap containers die
     shell: |
@@ -267,7 +267,7 @@
       state: absent
     with_items:
       - "{{ ceph_osd_docker_devices }}"
-      - "{{ raw_journal_devices }}"
+      - "{{ raw_journal_devices|default([]) }}"
 
   - name: remove ceph osd service
     file: