diff options
| author | Soumya Koduri <skoduri@redhat.com> | 2016-12-20 18:22:02 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2016-12-21 23:29:17 -0800 |
| commit | de576c08ef17706d25efecff7b57cc8c0294cf6f (patch) | |
| tree | adde8ef6882f8ac9ae1e2958e63257627db8937d | |
| parent | 253c43596b9dcf57832a0369b6c4dc01598bd442 (diff) | |
common-ha: Correct the VIP assigned to the new node added
There is a regression introduced with patch#16115. An incorrect
VIP gets assigned to the new node being added to the cluster.
This patch fixes the same.
Change-Id: I468c7d16bf7e4efa04692db83b1c5ee58fbb7d5f
BUG: 1406410
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-on: http://review.gluster.org/16213
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
| -rw-r--r-- | extras/ganesha/scripts/ganesha-ha.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 43bc10bf069..5968dbaf828 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -598,16 +598,16 @@ addnode_recreate_resources() recreate_resources ${cibfile} ${HA_SERVERS} pcs -f ${cibfile} resource create ${add_node}-nfs_block ocf:heartbeat:portblock \ - protocol=tcp portno=2049 action=block ip=${ipaddr} --group ${add_node}-group + protocol=tcp portno=2049 action=block ip=${add_vip} --group ${add_node}-group if [ $? -ne 0 ]; then logger "warning pcs resource create ${add_node}-nfs_block failed" fi pcs -f ${cibfile} resource create ${add_node}-cluster_ip-1 ocf:heartbeat:IPaddr \ - ip=${ipaddr} cidr_netmask=32 op monitor interval=15s --group ${add_node}-group \ + ip=${add_vip} cidr_netmask=32 op monitor interval=15s --group ${add_node}-group \ --after ${add_node}-nfs_block if [ $? -ne 0 ]; then logger "warning pcs resource create ${add_node}-cluster_ip-1 ocf:heartbeat:IPaddr \ - ip=${ipaddr} cidr_netmask=32 op monitor interval=15s failed" + ip=${add_vip} cidr_netmask=32 op monitor interval=15s failed" fi pcs -f ${cibfile} constraint order nfs-grace-clone then ${add_node}-cluster_ip-1 @@ -615,7 +615,7 @@ addnode_recreate_resources() logger "warning: pcs constraint order nfs-grace-clone then ${add_node}-cluster_ip-1 failed" fi pcs -f ${cibfile} resource create ${add_node}-nfs_unblock ocf:heartbeat:portblock \ - protocol=tcp portno=2049 action=unblock ip=${ipaddr} reset_local_on_unblock_stop=true \ + protocol=tcp portno=2049 action=unblock ip=${add_vip} reset_local_on_unblock_stop=true \ tickle_dir=${HA_VOL_MNT}/nfs-ganesha/tickle_dir/ --group ${add_node}-group --after \ ${add_node}-cluster_ip-1 op stop timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op start \ timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op monitor interval=10s \ |