From 97adfece98bcb7987fa0a1b6cc27439e04eef3b4 Mon Sep 17 00:00:00 2001
From: Mohit Agrawal <moagrawa@redhat.com>
Date: Wed, 29 Jun 2016 15:36:41 +0530
Subject: gluster v set help does not show ssl options

Problem: "gluster v set help" does not show ssl options.

Solution: Remove NO_DOC option for client.ssl/server.ssl from glusterd_volopt_map.
Backport of commit 9733c68e878869daec196bf7bca16780eef73f74
BUG: 1365757
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>

> Change-Id: Iabe982ea56398209bbf30d41260798e5ad7fce7b
> BUG: 1351134
> Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
> Reviewed-on: http://review.gluster.org/14829
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> (cherry picked from commit 9733c68e878869daec196bf7bca16780eef73f74)

Change-Id: Ic602ede19342fb8c507e1daed56d4883392fb172
Reviewed-on: http://review.gluster.org/15131
Tested-by: MOHIT AGRAWAL <moagrawa@redhat.com>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
---
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'xlators')

diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 0d8d63ed7aa..2c304283466 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1463,8 +1463,9 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .key        = "client.ssl",
           .voltype    = "protocol/client",
           .option     = "transport.socket.ssl-enabled",
-          .type       = NO_DOC,
           .op_version = 2,
+          .description = "enable/disable client.ssl flag in the "
+                         "volume.",
           .flags      = OPT_FLAG_CLIENT_OPT
         },
         { .key        = "network.remote-dio",
@@ -1563,7 +1564,8 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .key         = "server.ssl",
           .voltype     = "protocol/server",
           .option      = "transport.socket.ssl-enabled",
-          .type        = NO_DOC,
+          .description = "enable/disable server.ssl flag in the "
+                         "volume.",
           .op_version  = 2
         },
         { .key         = "auth.ssl-allow",
-- 
cgit