]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-docker-cluster: default raw_journal_devices to []
authorAndrew Schoen <aschoen@redhat.com>
Thu, 25 May 2017 12:30:25 +0000 (07:30 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 31 May 2017 15:10:14 +0000 (10:10 -0500)
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>
(cherry picked from commit 8e322d4825a0c53ae260faa3324eef4dfd0b28b0)

infrastructure-playbooks/purge-docker-cluster.yml

index 0f0a474524a611d0cab16e3d4b291153eb6da152..1104287792572063dc2a573b3a3a167c2512c6ad 100644 (file)
       zap_device
     with_items:
       - "{{ ceph_osd_docker_devices }}"
-      - "{{ raw_journal_devices }}"
+      - "{{ raw_journal_devices|default([]) }}"
 
   - name: wait until the zap containers die
     shell: |
       state: absent
     with_items:
       - "{{ ceph_osd_docker_devices }}"
-      - "{{ raw_journal_devices }}"
+      - "{{ raw_journal_devices|default([]) }}"
 
   - name: remove ceph osd service
     file: