From 3557497336338ab2227bcb7c2373047291b4bc73 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 15 Dec 2020 14:49:57 -0500 Subject: [PATCH] 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) --- roles/ceph-validate/tasks/check_devices.yml | 2 +- roles/ceph-validate/tasks/main.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 51c2fac28..ae989b0fc 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -140,7 +140,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