Merge pull request #1690 from yanyixing/master

fix: when osd device is a disk partition
pull/1703/merge v2.3.0rc5
Sébastien Han 2017-07-26 15:55:29 +02:00 committed by GitHub
commit fad9d0caec
1 changed files with 8 additions and 1 deletions

View File

@ -308,7 +308,14 @@
when: "{{ encrypted_ceph_partuuid.stdout_lines | length > 0 }}" when: "{{ encrypted_ceph_partuuid.stdout_lines | length > 0 }}"
- name: zap osd disks - 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 }}" with_items: "{{ devices }}"
when: when:
- ceph_disk_present.rc == 0 - ceph_disk_present.rc == 0