summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaurav Kumar Garg <ggarg@redhat.com>2015-07-01 17:55:47 +0530
committerAtin Mukherjee <amukherj@redhat.com>2016-03-21 21:04:20 -0700
commit8b3dd6a7841755816ac15cb206602efb07c3c102 (patch)
tree5a629b3ef05c94218e0f77a607fb0154a85f5bd6
parentdc0406c3422c7d3a901b977978b400d77d6dd7ec (diff)
extra: "enable-shared-storage" key should create shared-storage
This patch is backport of: http://review.gluster.org/#/c/11491/ Currently while creating shared storage it accept only "cluster.enable-shared-storage" key. It should also accept "enable-shared-storage" key. Change-Id: I4c68782f4b7927ec8cd725e411b0b9db17d9c48d BUG: 1319645 Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com> >> Change-Id: I4c68782f4b7927ec8cd725e411b0b9db17d9c48d >> BUG: 1238224 >> Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com> >> Reviewed-on: http://review.gluster.org/11491 >> Tested-by: NetBSD Build System <jenkins@build.gluster.org> >> Tested-by: Gluster Build System <jenkins@build.gluster.com> >> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> >> Reviewed-by: Avra Sengupta <asengupt@redhat.com> (cherry picked from commit 890e58f5d4d3db9477e36cac3d16798ffe3b0480) Change-Id: Ic77fd67b90be3381cff33f18f49eee97972eb19a Reviewed-on: http://review.gluster.org/13794 Tested-by: Gaurav Kumar Garg <ggarg@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
-rwxr-xr-xextras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh b/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh
index 90802196b40..ad51babd5f7 100755
--- a/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh
+++ b/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh
@@ -2,7 +2,7 @@
key=`echo $3 | cut -d '=' -f 1`
val=`echo $3 | cut -d '=' -f 2`
-if [ "$key" != "cluster.enable-shared-storage" ]; then
+if [ ! "$key" -eq "enable-shared-storage" -o "$key" -eq "cluster.enable-shared-storage" ]; then
exit;
fi
if [ "$val" != 'enable' ]; then