summaryrefslogtreecommitdiffstats
path: root/extras/ganesha
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2015-06-01 14:02:58 -0400
committerNiels de Vos <ndevos@redhat.com>2015-06-11 13:12:11 -0700
commit04791e4d53650eb108890e9ad9a809768a06987b (patch)
treea7ce3371ea797612a2f509c63d901f20a643aef4 /extras/ganesha
parent9eef639e19c01712aaadfffda22aef795bf1dfeb (diff)
common-ha: handle long node names and node names with '-' and '.' in them
sourcing the /etc/ganesha/ganesha-ha.conf file seemed like a simple and elegant solution for reading config params, but bash variable names do not allow '-' and '.' in them. Also fix incorrect path in shared volume mount Change-Id: I40140e5da0903221efd316de94dce40229263e15 BUG: 1225572 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/11035 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras/ganesha')
-rw-r--r--extras/ganesha/config/ganesha-ha.conf.sample16
-rw-r--r--extras/ganesha/ocf/ganesha_nfsd4
2 files changed, 8 insertions, 12 deletions
diff --git a/extras/ganesha/config/ganesha-ha.conf.sample b/extras/ganesha/config/ganesha-ha.conf.sample
index a7ffa5c28dc..24054abfdff 100644
--- a/extras/ganesha/config/ganesha-ha.conf.sample
+++ b/extras/ganesha/config/ganesha-ha.conf.sample
@@ -5,22 +5,18 @@ HA_NAME="ganesha-ha-360"
# The gluster server from which to mount the shared data volume.
HA_VOL_SERVER="server1"
#
-# N.B. you may use short names, long names, or IP addresses. Once you
-# select one, stay with it as it will be mildly unpleasant to clean up
-# if you switch later on. Ensure that all names - short and/or long -
-# are in DNS or /etc/hosts on all machines in the cluster.
+# N.B. you may use short names or long names; you may not use IP addrs.
+# Once you select one, stay with it as it will be mildly unpleasant to
+# clean up if you switch later on. Ensure that all names - short and/or
+# long - are in DNS or /etc/hosts on all machines in the cluster.
#
-# The subset of nodes of the Gluster Trusted Pool
-# that forms the ganesha HA cluster. IP/Hostname
-# is specified.
+# The subset of nodes of the Gluster Trusted Pool that form the ganesha
+# HA cluster. Hostname is specified.
HA_CLUSTER_NODES="server1,server2,..."
#HA_CLUSTER_NODES="server1.lab.redhat.com,server2.lab.redhat.com,..."
-#HA_CLUSTER_NODES="10.0.1.1,10.0.1.2,..."
#
# Virtual IPs for each of the nodes specified above.
VIP_server1="10.0.2.1"
VIP_server2="10.0.2.2"
#VIP_server1.lab.redhat.com="10.0.2.1"
#VIP_server2.lab.redhat.com="10.0.2.2"
-#VIP_10.0.1.1="10.0.2.1"
-#VIP_10.0.1.2="10.0.2.2"
diff --git a/extras/ganesha/ocf/ganesha_nfsd b/extras/ganesha/ocf/ganesha_nfsd
index d69b9f4ad47..e064183daef 100644
--- a/extras/ganesha/ocf/ganesha_nfsd
+++ b/extras/ganesha/ocf/ganesha_nfsd
@@ -105,9 +105,9 @@ ganesha_nfsd_stop()
if [ -d /var/lib/nfs ]; then
mv /var/lib/nfs /var/lib/nfs.backup
- ln -s $OCF_RESKEY_ha_vol_mnt/${long_host}/nfs /var/lib/nfs
+ ln -s $OCF_RESKEY_ha_vol_mnt/nfs-ganesha/${long_host}/nfs /var/lib/nfs
if [ $? -ne 0 ]; then
- logger "warning: ln -s $OCF_RESKEY_ha_vol_mnt/${long_host}/nfs /var/lib/nfs failed"
+ logger "warning: ln -s $OCF_RESKEY_ha_vol_mnt/nfs-ganesha/${long_host}/nfs /var/lib/nfs failed"
fi
fi