Merge pull request #100 from pb-it/master

Fix for devices like /dev/cciss/c0d0, /dev/xvda
pull/101/head
Leseb 2014-07-23 16:53:57 +02:00
commit ec6134e292
1 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@
# #
- name: Check if the device is a partition or a disk - name: Check if the device is a partition or a disk
shell: echo '{{ item }}' | egrep '/dev/[a-z]{3}[0-9]$' shell: echo '{{ item }}' | egrep '/dev/(([a-z]{3,4}[0-9]$)|(cciss/c[0-9]{1}d[0-9]{1}p[0-9]$))'
ignore_errors: true ignore_errors: true
with_items: devices with_items: devices
register: ispartition register: ispartition
@ -71,7 +71,7 @@
# partition. # partition.
- name: Activate OSD(s) when device is a disk - name: Activate OSD(s) when device is a disk
command: ceph-disk activate {{ item.2 }}1 command: ceph-disk activate {{ item.2 | regex_replace('^(\/dev\/cciss\/c[0-9]{1}d[0-9]{1})$', '\\1p') }}1
with_together: with_together:
- parted.results - parted.results
- ispartition.results - ispartition.results