]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge: fix lvm-batch purge osd
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 2 Apr 2019 08:43:01 +0000 (10:43 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 4 Apr 2019 01:38:52 +0000 (03:38 +0200)
`lvm_volumes` and/or `devices` variable(s) can be undefined depending on
the scenario chosen.

These tasks should be run only if these variable are defined, otherwise
it ends up with undefined variable errors.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1653307
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 01807383132c2897e331dcc665f062f8be0feeb8)

infrastructure-playbooks/purge-cluster.yml
infrastructure-playbooks/purge-docker-cluster.yml

index 0aca628f1770c0a02215f5b919410c4a7202774a..b4aa40e3debbd765df1a8ab700627872fb01d3cd 100644 (file)
       CEPH_VOLUME_DEBUG: 1
     with_items: "{{ lvm_volumes }}"
     when:
+      - lvm_volumes | default([]) | length > 0
       - osd_scenario == "lvm"
       - ceph_volume_present.rc == 0
 
       CEPH_VOLUME_DEBUG: 1
     with_items: "{{ devices | default([]) }}"
     when:
+      - devices | default([]) | length > 0
       - osd_scenario == "lvm"
       - ceph_volume_present.rc == 0
 
index 7ce366802560530bfebc06ed4996bfecfac48d2f..2d62f07168748b409e6755102ac03949d7124007 100644 (file)
           CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
           CEPH_CONTAINER_BINARY: "{{ container_binary }}"
         with_items: "{{ lvm_volumes }}"
+        when: lvm_volumes | default([]) | length > 0
 
       - name: zap and destroy osds created by ceph-volume with devices
         ceph_volume:
           CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
           CEPH_CONTAINER_BINARY: "{{ container_binary }}"
         with_items: "{{ devices | default([]) }}"
+        when: devices | default([]) | length > 0
     when:
       - osd_scenario == "lvm"