summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2015-10-30 16:09:29 +0530
committerVijay Bellur <vbellur@redhat.com>2015-11-23 11:08:37 -0800
commit1c7ffac108572b7085d8aea040f5726c6134d025 (patch)
tree02d075e8b3ecb675d60ff25ee35fcfeb288374f4 /xlators/mgmt/glusterd
parentf46a54326871bed28c64cd5312b250c7c8207e4f (diff)
geo-rep: Allow setting config remote_gsyncd
Restrictive ssh is not used in containerized environment where networking configuration is "net=host". SSH Pem keys pushed to the slave without gsyncd path in it. (Patch #12459) Actual remote_gsyncd path need to be set to actual path of gsyncd. With this patch, remote_gsyncd is removed from reserved option list. Change-Id: Ia2063e4654e378b62b2414bdad21143c86ad1b9a Signed-off-by: Aravinda VK <avishwan@redhat.com> BUG: 1283060 Reviewed-on: http://review.gluster.org/12472 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Saravanakumar Arumugam <sarumuga@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> (cherry picked from commit 7de355b42dc1f8313db3ffc775a0e1708ba85243) Reviewed-on: http://review.gluster.org/12644 Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-geo-rep.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
index 2f2ad867a5b..8006a4de821 100644
--- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
@@ -74,7 +74,6 @@ struct gsync_config_opt_vals_ gsync_confopt_vals[] = {
static char *gsync_reserved_opts[] = {
"gluster-command-dir",
"pid-file",
- "remote-gsyncd"
"state-file",
"session-owner",
"state-socket-unencoded",