summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2016-12-20 23:13:25 -0500
committerVijay Bellur <vbellur@redhat.com>2016-12-20 23:13:25 -0500
commit9bdf6792d7e0c040541fe3f2736cba5a53935a66 (patch)
tree7bb4471b2355a9412110710bad24210591427c95 /xlators/mgmt/glusterd
parent2bb2313656a19ee8efe3cfeda4f2ae90e8e49b62 (diff)
encryption: Move all xlators to experimentalexp
rot-13 is never meant to be used in production. crypt requires a lot more attention before it can be ready for production. Hence moving both xlators to experimental. Change-Id: I6dce653c88e2ede109f3031ab9e8f318ce7d87cb Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index a270f136c92..9809cb68e40 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -4045,7 +4045,8 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
if (ret == -1)
goto out;
if (ret) {
- xl = volgen_graph_add (graph, "encryption/crypt", volname);
+ xl = volgen_graph_add (graph, "experimental/encryption/crypt",
+ volname);
if (!xl) {
ret = -1;
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 68c57fc10cb..5e9616bdfcd 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1602,7 +1602,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
/* Crypt xlator options */
{ .key = "features.encryption",
- .voltype = "encryption/crypt",
+ .voltype = "experimental/encryption/crypt",
.option = "!feat",
.value = "off",
.op_version = 3,
@@ -1612,17 +1612,17 @@ struct volopt_map_entry glusterd_volopt_map[] = {
},
{ .key = "encryption.master-key",
- .voltype = "encryption/crypt",
+ .voltype = "experimental/encryption/crypt",
.op_version = 3,
.flags = OPT_FLAG_CLIENT_OPT
},
{ .key = "encryption.data-key-size",
- .voltype = "encryption/crypt",
+ .voltype = "experimental/encryption/crypt",
.op_version = 3,
.flags = OPT_FLAG_CLIENT_OPT
},
{ .key = "encryption.block-size",
- .voltype = "encryption/crypt",
+ .voltype = "experimental/encryption/crypt",
.op_version = 3,
.flags = OPT_FLAG_CLIENT_OPT
},