Merge pull request #100 from pb-it/master

Fix for devices like /dev/cciss/c0d0, /dev/xvda

roles/ceph-osd/tasks/journal_collocation.yml

@@ -22,7 +22,7 @@
 #
 
 - 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
   with_items: devices
   register: ispartition
@@ -71,7 +71,7 @@
 # partition.
 
 - 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:
     - parted.results
     - ispartition.results