From c506658cf9ee9f00c1523190208e4fa77ea8b4b3 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mon, 15 Jun 2015 15:48:33 -0400 Subject: [PATCH 083/101] 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. (A short term work-around is to simply eliminate them.) Change-Id: I3bd814abbf0e957af11bb4d9a3241445ab7b5ed6 BUG: 1227311 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://code.engineering.redhat.com/gerrit/50770 Reviewed-by: Niels de Vos Tested-by: Niels de Vos --- extras/ganesha/scripts/ganesha-ha.sh | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 9d73cf9..7c7e9c5 100755 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -343,11 +343,14 @@ setup_create_resources() while [[ ${1} ]]; do - ipaddr=$(grep "^VIP_${1}=" ${HA_CONFDIR}/ganesha-ha.conf | cut -d = -f 2) + name="VIP_${1}" + nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf) + eval ${nvs} + eval ipaddr=\$$name 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 - logger "warning pcs resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=10s failed" + logger "warning pcs resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=15s failed" fi pcs -f ${cibfile} resource create ${1}-trigger_ip-1 ocf:heartbeat:Dummy @@ -437,7 +440,10 @@ recreate_resources() local cibfile=${1}; shift while [[ ${1} ]]; do - ipaddr=$(grep "VIP_${1}=" ${HA_CONFDIR}/ganesha-ha.conf | cut -d = -f 2) + name="VIP_${1}" + nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf) + eval ${nvs} + eval ipaddr=\$$name 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 -- 1.7.1