]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-volume: strip _dmcrypt suffix in simple scan json output 33618/head
authorJan Fajerski <jfajerski@suse.com>
Wed, 5 Feb 2020 05:01:16 +0000 (06:01 +0100)
committerJan Fajerski <jfajerski@suse.com>
Fri, 28 Feb 2020 14:01:45 +0000 (15:01 +0100)
commit370bf139bf8e9ab448c8b152f261e2c970739c6b
tree74283e4fbaf041866fcd8da757143a18f4496244
parente7789ca83f00f5e3a591cd1f3f300bbdf35f6936
ceph-volume: strip _dmcrypt suffix in simple scan json output

LUKS encrypted OSDs name their block* files with a _dmcrypt suffix.
activate fails on json files like this. Stripping this suffix in scan
fixes this.

Fixes: https://tracker.ceph.com/issues/43966
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2ddf76d118d77659c590ea076d34ce9a8e351a86)
src/ceph-volume/ceph_volume/devices/simple/scan.py