summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2015-06-17 10:48:03 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-06-18 10:16:24 -0700
commit26f17994a45210792a4af23fcbc8e1759218f2e8 (patch)
tree646aed459a1a32c5efc72d6a575271ceac467539
parente9a681fb977f94e2309cb16625102ebb74e5dc77 (diff)
common-ha: cluster HA setup sometimes fails
the "s in the VIP_foo="x.x.x.x" lines are problematic now that the config file isn't sourced. Revised to also handle names containing '-', e.g. host-11, and FQNs, e.g. host-11.lab.gluster.org Change-Id: I1a52afbf398a024cdff851d0c415d8363f699c90 BUG: 1232001 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/11281 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Meghana M <mmadhusu@redhat.com> Reviewed-by: soumya k <skoduri@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rwxr-xr-xextras/ganesha/scripts/ganesha-ha.sh26
1 files changed, 22 insertions, 4 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index 147864793c0..fc2a00980c1 100755
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -343,10 +343,23 @@ setup_create_resources()
while [[ ${1} ]]; do
+ # this is variable indirection
+ # from a nvs like 'VIP_host1=10.7.6.5' or 'VIP_host1="10.7.6.5"'
+ # (or VIP_host-1=..., or VIP_host-1.my.domain.name=...)
+ # a variable 'clean_name' is created (e.g. w/ value 'VIP_host_1')
+ # and a clean nvs (e.g. w/ value 'VIP_host_1="10_7_6_5"')
+ # after the `eval ${clean_nvs}` there is a variable VIP_host_1
+ # with the value '10_7_6_5', and the following \$$ magic to
+ # reference it, i.e. `eval tmp_ipaddr=\$${clean_name}` gives us
+ # ${tmp_ipaddr} with 10_7_6_5 and then convert the _s back to .s
+ # to give us ipaddr="10.7.6.5". whew!
name="VIP_${1}"
+ clean_name=${name//[-.]/_}
nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf)
- eval ${nvs}
- eval ipaddr=\$$name
+ clean_nvs=${nvs//[-.]/_}
+ eval ${clean_nvs}
+ eval tmp_ipaddr=\$${clean_name}
+ ipaddr=${tmp_ipaddr//_/.}
pcs -f ${cibfile} resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=15s
if [ $? -ne 0 ]; then
@@ -440,10 +453,15 @@ recreate_resources()
local cibfile=${1}; shift
while [[ ${1} ]]; do
+ # this is variable indirection
+ # see the comment on the same a few lines up
name="VIP_${1}"
+ clean_name=${name//[-.]/_}
nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf)
- eval ${nvs}
- eval ipaddr=\$$name
+ clean_nvs=${nvs//[-.]/_}
+ eval ${clean_nvs}
+ eval tmp_ipaddr=\$${clean_name}
+ ipaddr=${tmp_ipaddr//_/.}
pcs -f ${cibfile} resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=15s
if [ $? -ne 0 ]; then