summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2016-06-23 17:41:09 +0530
committerNiels de Vos <ndevos@redhat.com>2016-07-04 06:28:24 -0700
commit31de95d5f3b71b4bfd0042e2612fc2ee15f9834c (patch)
treeaab14c9daa3e0a958c5f72c27866589267912d72
parent6484ac71abbc183b31767f6ba761f870be37de76 (diff)
ganesha/scripts : delete nfs-ganesha folder from shared storage during clean up
A directory named "nfs-ganesha" will be created inside shared storage when 'gluster nfs-ganesha enable' is executed. Similarly this directory should be removed when 'gluster nfs-ganesha disable' is executed. Upstream reference: >Change-Id: Icc09b32010de07c9809e22aafbb2fd08a5c8252f >BUG: 1349398 >Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> >Reviewed-on: http://review.gluster.org/14782 >Smoke: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: Niels de Vos <ndevos@redhat.com> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.org> >(cherry picked from commit ec3ea75513347deb95960f49d58fc19478a7ad17) Change-Id: Icc09b32010de07c9809e22aafbb2fd08a5c8252f BUG: 1351154 Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> Reviewed-on: http://review.gluster.org/14833 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rw-r--r--extras/ganesha/scripts/ganesha-ha.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index f43dbf4b296..8b55abbc6c5 100644
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -421,6 +421,7 @@ cleanup_ganesha_config ()
rm -rf /etc/cluster/cluster.conf*
rm -rf /var/lib/pacemaker/cib/*
sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' ${GANESHA_CONF}
+ rm -rf ${HA_VOL_MNT}/nfs-ganesha
}
do_create_virt_ip_constraints()