|
|
cb8e9e |
From 596c0ab6b398a911f0093deb7f2cbf4287eb2c35 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Kotresh HR <khiremat@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 24 Jun 2015 18:30:18 +0530
|
|
|
cb8e9e |
Subject: [PATCH 137/190] geo-rep: Fix glusterd working directory
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Mountbroker setup in geo-replication requires
|
|
|
cb8e9e |
the script 'set_geo_rep_pem_keys.sh to be
|
|
|
cb8e9e |
run manually out of gluster context. Hence
|
|
|
cb8e9e |
the ${GLUSTERD_WORKDIR} is never set. So
|
|
|
cb8e9e |
getting glusterd working dir using 'gluster
|
|
|
cb8e9e |
system:: getwd'.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
BUG: 1235225
|
|
|
cb8e9e |
Change-Id: I14beb1810b110804714acf714567580d34783690
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/11381
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/11382
|
|
|
cb8e9e |
Reviewed-by: Aravinda VK <avishwan@redhat.com>
|
|
|
cb8e9e |
Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51602
|
|
|
cb8e9e |
Reviewed-by: Venky Shankar <vshankar@redhat.com>
|
|
|
cb8e9e |
Tested-by: Venky Shankar <vshankar@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
geo-replication/src/set_geo_rep_pem_keys.sh | 1 +
|
|
|
cb8e9e |
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/geo-replication/src/set_geo_rep_pem_keys.sh b/geo-replication/src/set_geo_rep_pem_keys.sh
|
|
|
cb8e9e |
index 4f613da..ae23f4f 100755
|
|
|
cb8e9e |
--- a/geo-replication/src/set_geo_rep_pem_keys.sh
|
|
|
cb8e9e |
+++ b/geo-replication/src/set_geo_rep_pem_keys.sh
|
|
|
cb8e9e |
@@ -12,6 +12,7 @@ function main()
|
|
|
cb8e9e |
user=$1
|
|
|
cb8e9e |
master_vol=$2
|
|
|
cb8e9e |
slave_vol=$3
|
|
|
cb8e9e |
+ GLUSTERD_WORKDIR=$(gluster system:: getwd)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
if [ "$user" == "" ]; then
|
|
|
cb8e9e |
echo "Please enter the user's name"
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|