From 038b26fa7a4c7bf72ede6386eb543b5668fe17bf Mon Sep 17 00:00:00 2001 From: Ben England Date: Fri, 9 Oct 2015 06:40:57 -0400 Subject: [PATCH] fix regex syntax for alternative device types --- roles/ceph-osd/tasks/check_devices.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml index 309b7b5a5..447a6de0c 100644 --- a/roles/ceph-osd/tasks/check_devices.yml +++ b/roles/ceph-osd/tasks/check_devices.yml @@ -4,8 +4,14 @@ # it should exist we rc=0 and don't do anything unless we do something like --force # As as a final word, I prefer to keep the partition check instead of running ceph-disk prepare with "failed_when: false" # I believe it's safer -- name: check if the device is a partition or a disk - shell: "echo '{{ item }}' | egrep '/dev/[sd[a-z]{1,2}|hd[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p][0-9]{1,2}$'" +# +# regex syntax uses (pat1|pat2|...|patN) for different families of device +# names, but has a common expression for partition number at the end. +# allow 2-digit partition numbers so fast SSDs can be shared by > 9 disks +# for SSD journals. + +- name: check if the device is a partition + shell: "echo '{{ item }}' | egrep '/dev/(sd[a-z]{1,2}|hd[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 changed_when: false failed_when: false -- 2.39.5