From 1725880dabd2bac8739043c4cb5f9d844557f86e Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Mon, 17 Jun 2019 16:49:48 +0530 Subject: encryption/crypt: remove from volume file The feature is not supported and is moved out of the codebase from glusterfs-5.x release. Doesn't make sense to keep the code to support it. For those who want to upgrade from an version supporting it to higher version, please do a 'gluster volume reset $VOL encryption reset' and then continue with the upgrade process. updates: bz#1648169 Change-Id: I8cf822c0d7195940bd37f6af2432a3cac68d44d1 Signed-off-by: Amar Tumballi --- xlators/mgmt/glusterd/src/glusterd-volume-set.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-set.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index abc1573f372..5622afbe47d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1439,29 +1439,6 @@ struct volopt_map_entry glusterd_volopt_map[] = { .voltype = "performance/nl-cache", .option = "pass-through", .op_version = GD_OP_VERSION_4_1_0}, - /* Crypt xlator options */ - - {.key = "features.encryption", - .voltype = "encryption/crypt", - .option = "!feat", - .value = "off", - .op_version = 3, - .description = "enable/disable client-side encryption for " - "the volume.", - .flags = VOLOPT_FLAG_CLIENT_OPT | VOLOPT_FLAG_XLATOR_OPT}, - - {.key = "encryption.master-key", - .voltype = "encryption/crypt", - .op_version = 3, - .flags = VOLOPT_FLAG_CLIENT_OPT}, - {.key = "encryption.data-key-size", - .voltype = "encryption/crypt", - .op_version = 3, - .flags = VOLOPT_FLAG_CLIENT_OPT}, - {.key = "encryption.block-size", - .voltype = "encryption/crypt", - .op_version = 3, - .flags = VOLOPT_FLAG_CLIENT_OPT}, /* Client xlator options */ {.key = "network.frame-timeout", -- cgit