From: Dimitri Savineau Date: Tue, 15 Dec 2020 19:49:57 +0000 (-0500) Subject: ceph-validate: check devices from lvm_volumes X-Git-Tag: v5.0.8~27 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a3b5b151604f355ba271874827127791ce734296;p=ceph-ansible.git ceph-validate: check devices from lvm_volumes 2888c08 introduced a regression as the check_devices tasks file was only included based on the devices variable. But that file also validate some devices from the lvm_volumes variable. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1906022 Signed-off-by: Dimitri Savineau (cherry picked from commit ac0342b72e045b96a31bed23c6baeceeecca7f23) --- diff --git a/roles/ceph-validate/tasks/check_devices.yml b/roles/ceph-validate/tasks/check_devices.yml index 5f439ac6a..930f45431 100644 --- a/roles/ceph-validate/tasks/check_devices.yml +++ b/roles/ceph-validate/tasks/check_devices.yml @@ -83,7 +83,7 @@ unit: MiB register: devices_parted failed_when: False - with_items: "{{ devices }}" + with_items: "{{ devices | default([]) }}" - name: fail if one of the devices is not a device fail: diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml index 29f09ca45..447f2d6c9 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -152,7 +152,6 @@ when: - osd_group_name in group_names - not osd_auto_discovery | default(False) | bool - - devices|default([])|length > 0 - name: include check_eth_mon.yml include_tasks: check_eth_mon.yml