diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2015-06-15 15:29:41 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-06-16 08:16:57 -0700 |
| commit | 1b9a2edf2c18324ae961dd143e9e9685a019087f (patch) | |
| tree | 4932844d932e888d82799f0a6d4977b7304473f4 | |
| parent | 4a829e33d9c0d62a710650337406dc25d89cc599 (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.
(A short term work-around is to simply eliminate them.)
Change-Id: I65f375f2d3b8453adb45dc3dbbc7d3fb07cf85d0
BUG: 1232001
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/11237
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-x | extras/ganesha/scripts/ganesha-ha.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 9d73cf93da0..147864793c0 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 @@ -761,7 +767,6 @@ main() teardown_resources ${HA_SERVERS} teardown_cluster ${HA_NAME} - ;; cleanup | --cleanup) |