mirror of https://github.com/ceph/ceph-ansible.git
ceph-osd: get full link path when testing if a partition
This allows us to test devices set with persistent naming such as /dev/disk/by-* When registering devices we can use persisent (/dev/disk/by-*) or non-persistent (/dev/sd*). Both declarations are supported by ceph-ansible. There was just two tasks that were not compatible with this. Since we support using partitions directly we need to test that because the device activation will be different. To test if the device is a partition we use a regular expression which wasn't compatible with the persistent device naming format (/dev/disk/by-*). This commit solves this issue by reading the path of the symlink since devices like /dev/disk/by-* are symlinks to devices like /dev/sd* Signed-off-by: Sébastien Han <seb@redhat.com>pull/981/head
parent
112a2b2970
commit
381af6c18d
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
- name: check if the device is a partition (autodiscover disks)
|
- name: check if the device is a partition (autodiscover disks)
|
||||||
shell: "echo '/dev/{{ item.key }}' | egrep '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p)[0-9]{1,2}$'"
|
shell: "readlink -f /dev/{{ item.key }} | egrep '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p)[0-9]{1,2}$'"
|
||||||
with_dict: "{{ ansible_devices }}"
|
with_dict: "{{ ansible_devices }}"
|
||||||
changed_when: false
|
changed_when: false
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
- name: check if the device is a partition
|
- name: check if the device is a partition
|
||||||
shell: "echo '{{ item }}' | egrep '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p)[0-9]{1,2}$'"
|
shell: "readlink -f {{ item }} | egrep '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p)[0-9]{1,2}$'"
|
||||||
with_items: "{{ devices }}"
|
with_items: "{{ devices }}"
|
||||||
changed_when: false
|
changed_when: false
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
Loading…
Reference in New Issue