fix: when osd device is a disk partition

pull/1690/head
yanyx 2017-07-18 14:56:12 +08:00
parent b3ac49f750
commit 2e6233271e
1 changed files with 8 additions and 1 deletions

View File

@ -309,7 +309,14 @@
when: "{{ encrypted_ceph_partuuid.stdout_lines | length > 0 }}"
- name: zap osd disks
shell: ceph-disk zap "{{ item }}"
shell: |
if (echo "{{ item }}" | grep -Esq '[0-9]{1,2}$'); then
raw_device=$(echo "{{ item }}" | grep -Eo '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]|nvme[0-9]n[0-9]){1,2}')
partition_nb=$(echo "{{ item }}" | grep -Eo '[0-9]{1,2}$')
sgdisk --delete $partition_nb $raw_device
else
ceph-disk zap "{{ item }}"
fi
with_items: "{{ devices }}"
when:
- ceph_disk_present.rc == 0