]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
rbd, rbd-nbd: accept "luks", "luks1" and "luks2" formats
authorIlya Dryomov <idryomov@gmail.com>
Sat, 19 Nov 2022 12:30:55 +0000 (13:30 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Sun, 4 Dec 2022 17:19:19 +0000 (18:19 +0100)
commite62e3b6613f93ffd40208d68d400c59a1c32edf9
treee14c0a3c06a3a3cc99bd5fd6b8f235ed5ca460d9
parent75acf7b6f5383fb6fbeeb0cdfe57da0638b8aab6
rbd, rbd-nbd: accept "luks", "luks1" and "luks2" formats

Since RBD_ENCRYPTION_FORMAT_LUKS1, RBD_ENCRYPTION_FORMAT_LUKS2
and RBD_ENCRYPTION_FORMAT_LUKS aren't treated the same when loading
encryption anymore, "luks1" and "luks2" formats need to be accepted
in addition to "luks" format.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
doc/man/8/rbd-nbd.rst
qa/workunits/rbd/luks-encryption.sh
src/test/cli/rbd/help.t
src/tools/rbd/ArgumentTypes.cc
src/tools/rbd/Utils.cc
src/tools/rbd/Utils.h
src/tools/rbd_nbd/rbd-nbd.cc