diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2022-11-19 13:30:55 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2022-12-04 18:19:19 +0100 |
| commit | e62e3b6613f93ffd40208d68d400c59a1c32edf9 (patch) | |
| tree | e14c0a3c06a3a3cc99bd5fd6b8f235ed5ca460d9 /src/test/cli | |
| parent | librbd: don't decay LUKS{1,2}EncryptionFormat into LUKSEncryptionFormat (diff) | |
| download | ceph-e62e3b6613f93ffd40208d68d400c59a1c32edf9.tar.xz ceph-e62e3b6613f93ffd40208d68d400c59a1c32edf9.zip | |
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>
Diffstat (limited to 'src/test/cli')
| -rw-r--r-- | src/test/cli/rbd/help.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index 5c2a38031a5..c70d76f4cd7 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -878,7 +878,7 @@ --namespace arg namespace name --image arg image name --no-progress disable progress output - --encryption-format arg encryption formats [possible values: luks] + --encryption-format arg encryption format (luks, luks1, luks2) --encryption-passphrase-file arg path to file containing passphrase for unlocking the image @@ -2253,7 +2253,7 @@ -s [ --size ] arg image size (in M/G/T) [default: M] --allow-shrink permit shrinking --no-progress disable progress output - --encryption-format arg encryption formats [possible values: luks] + --encryption-format arg encryption format (luks, luks1, luks2) --encryption-passphrase-file arg path to file containing passphrase for unlocking the image |