From: Konstantin Shalygin <k0ste@k0ste.ru>
Date: Tue, 28 Nov 2017 14:27:09 +0000 (+0700)
Subject: ceph-osd: respect nvme partitions when device is a disk.
X-Git-Tag: beta-3.1.0~28
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d7dadc3e7b9d2e218d85784df72e4cd008ecb1ee;p=ceph-ansible.git

ceph-osd: respect nvme partitions when device is a disk.
---

diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml
index 7b4bf1620..9c587d724 100644
--- a/roles/ceph-osd/tasks/activate_osds.yml
+++ b/roles/ceph-osd/tasks/activate_osds.yml
@@ -3,7 +3,7 @@
 # partition.
 
 - name: activate osd(s) when device is a disk
-  command: ceph-disk activate "{{ item | regex_replace('^(\/dev\/cciss\/c[0-9]{1}d[0-9]{1})$', '\1p') | regex_replace('^(\/dev\/loop[0-9]{1})$', '\1p') }}1"
+  command: ceph-disk activate "{{ item }}{%- if 'nvme' in item or 'cciss' in item or 'loop' in item %}{{ 'p' }}{%- endif %}{{ '1' }}"
   with_items:
     - "{{ devices|unique }}"
   changed_when: false
@@ -12,8 +12,9 @@
     - not osd_auto_discovery
     - not dmcrypt
 
+
 - name: activate osd(s) when device is a disk (dmcrypt)
-  command: ceph-disk activate --dmcrypt "{{ item | regex_replace('^(\/dev\/cciss\/c[0-9]{1}d[0-9]{1})$', '\1p') | regex_replace('^(\/dev\/loop[0-9]{1})$', '\1p') }}1"
+  command: ceph-disk activate --dmcrypt "{{ item }}{%- if 'nvme' in item or 'cciss' in item or 'loop' in item %}{{ 'p' }}{%- endif %}{{ '1' }}"
   with_items:
     - "{{ devices|unique }}"
   changed_when: false