osd: fix bad activation for dmcrypt

We were activating dmcrypt devices with the wrong command. Basically the
first task execute the wrong activate command. The task fails but
continues because of the 'failed_when: false'. Then the right activation
sequence is being done by the next task.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 80d3a242d0134de5790a015b40c8af1e37a2322b)

diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml
index 2fd449ed1fd3404f5fb05e431efd6b97844bd8a8..13ea874e247095e6187de55d14e808e062f6cb0f 100644 (file)
--- a/roles/ceph-osd/tasks/activate_osds.yml
+++ b/roles/ceph-osd/tasks/activate_osds.yml
@@ -11,6 +11,7 @@
   register: activate_osd_disk
   when:
     - 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') }}1
@@ -45,3 +46,4 @@
   failed_when: false
   when:
     - not osd_auto_discovery
+    - not dmcrypt