ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #639 from ceph/enhance-regex 

ceph-osd: fix regex to check partitions
pull/629/merge
Leseb 2016-03-21 18:22:00 +01:00
parent a881900e2a 488f8e6c63
commit 20c3c88995
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-osd/tasks/check_devices.yml
View File

@ -11,7 +11,7 @@
# for SSD journals. # for SSD journals.
- name: check if the device is a partition - name: check if the device is a partition
shell: "echo '{{ item }}' | egrep '/dev/({h,s,v}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: "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}$'"
with_items: devices with_items: devices
changed_when: false changed_when: false
failed_when: false failed_when: false
@ -19,7 +19,7 @@
when: not osd_auto_discovery when: not osd_auto_discovery
- 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/({h,s,v}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: "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}$'"
with_dict: ansible_devices with_dict: ansible_devices
changed_when: false changed_when: false
failed_when: false failed_when: false