From: Ben England Date: Wed, 7 Oct 2015 16:50:42 +0000 (-0400) Subject: partition number should be at end of string for any device type X-Git-Tag: v1.0.0~111^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=543e4cb2449ae72f3b1c8ecfd08b644a54db76e9;p=ceph-ansible.git partition number should be at end of string for any device type --- diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml index 50d454439..309b7b5a5 100644 --- a/roles/ceph-osd/tasks/check_devices.yml +++ b/roles/ceph-osd/tasks/check_devices.yml @@ -4,9 +4,8 @@ # 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}'" + 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