From: Sébastien Han Date: Thu, 16 Nov 2017 13:55:08 +0000 (+0100) Subject: osd: fix bad activation for dmcrypt X-Git-Tag: v3.0.13~3^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f515724d7ef844a57a3f7124688ccefeb676f06d;p=ceph-ansible.git 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 (cherry picked from commit 80d3a242d0134de5790a015b40c8af1e37a2322b) --- diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml index 2fd449ed1..13ea874e2 100644 --- 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