purge: fix lvm-batch purge osd

`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 0180738313)
pull/3788/head
Guillaume Abrioux 2019-04-02 10:43:01 +02:00
parent 3fd4354aaa
commit b723ef3fa2
2 changed files with 4 additions and 0 deletions

View File

@ -323,6 +323,7 @@
CEPH_VOLUME_DEBUG: 1
with_items: "{{ lvm_volumes }}"
when:
- lvm_volumes | default([]) | length > 0
- osd_scenario == "lvm"
- ceph_volume_present.rc == 0
@ -334,6 +335,7 @@
CEPH_VOLUME_DEBUG: 1
with_items: "{{ devices | default([]) }}"
when:
- devices | default([]) | length > 0
- osd_scenario == "lvm"
- ceph_volume_present.rc == 0

View File

@ -471,6 +471,7 @@
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:
@ -481,6 +482,7 @@
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"