From: Dimitri Savineau Date: Tue, 15 Dec 2020 20:02:59 +0000 (-0500) Subject: ceph-validate: do not resolve devices X-Git-Tag: v4.0.63~17 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f317df92ac275cac07d8b3ddef437fc74ec553a6;p=ceph-ansible.git ceph-validate: do not resolve devices This is already done in the ceph-facts role. Signed-off-by: Dimitri Savineau (cherry picked from commit 0df99dda8d8c5e1e9ce4384b480401043eaad07e) --- diff --git a/roles/ceph-validate/tasks/check_devices.yml b/roles/ceph-validate/tasks/check_devices.yml index 4644b374f..a8e2622bd 100644 --- a/roles/ceph-validate/tasks/check_devices.yml +++ b/roles/ceph-validate/tasks/check_devices.yml @@ -33,26 +33,10 @@ when: - item.skipped is undefined -- name: devices variable's tasks related - when: - - devices is defined - - devices | length > 0 - block: - - name: resolve devices in devices - command: "readlink -f {{ item }}" - changed_when: false - register: devices_resolved - with_items: "{{ devices }}" - - - name: set_fact devices_resolved - set_fact: - _devices: "{{ _devices | default([]) + [item.stdout] }}" - with_items: "{{ devices_resolved.results }}" - - name: fail if root_device is passed in lvm_volumes or devices fail: msg: "{{ root_device }} found in either lvm_volumes or devices variable" - when: root_device in lvm_volumes_data_devices | default([]) or root_device in _devices | default([]) + when: root_device in lvm_volumes_data_devices | default([]) or root_device in devices | default([]) - name: check devices are block devices block: