]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Revert "ceph-validate: do not resolve devices"
authorDimitri Savineau <dsavinea@redhat.com>
Tue, 6 Jul 2021 15:52:14 +0000 (11:52 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 7 Jul 2021 15:19:35 +0000 (17:19 +0200)
This reverts commit 2020b1310c1717c807a9baf9ef7be92bdc9c6a11.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-validate/tasks/check_devices.yml

index a8e2622bd3c1ba0581d77a14ee72abf202b1b296..4644b374f1b629df97b7d6789d89318ff75c36e5 100644 (file)
       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: