ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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/3787/head
Guillaume Abrioux 2019-04-02 10:43:01 +02:00
parent 3421cb08d9
commit 7136f1734e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infrastructure-playbooks/purge-cluster.yml
View File

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

2
infrastructure-playbooks/purge-docker-cluster.yml
View File

@ -465,6 +465,7 @@
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
CEPH_CONTAINER_BINARY: "docker" CEPH_CONTAINER_BINARY: "docker"
with_items: "{{ lvm_volumes }}" with_items: "{{ lvm_volumes }}"
when: lvm_volumes | default([]) | length > 0
- name: zap and destroy osds created by ceph-volume with devices - name: zap and destroy osds created by ceph-volume with devices
ceph_volume: ceph_volume:
@ -475,6 +476,7 @@
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
CEPH_CONTAINER_BINARY: "docker" CEPH_CONTAINER_BINARY: "docker"
with_items: "{{ devices | default([]) }}" with_items: "{{ devices | default([]) }}"
when: devices | default([]) | length > 0
when: when:
- osd_scenario == "lvm" - osd_scenario == "lvm"