dad45a06a5
stx-integ/base/cluster-resource-agents
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: I3a4ee4bde0adfd2a486bd5be3a151db85aa4947e
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
49 lines
1.1 KiB
Diff
49 lines
1.1 KiB
Diff
---
|
|
heartbeat/IPaddr2 | 21 ++++++++++++++++++---
|
|
1 file changed, 18 insertions(+), 3 deletions(-)
|
|
|
|
--- a/heartbeat/IPaddr2
|
|
+++ b/heartbeat/IPaddr2
|
|
@@ -661,7 +661,12 @@ ip_start() {
|
|
local ip_status=`ip_served`
|
|
|
|
if [ "$ip_status" = "ok" ]; then
|
|
- exit $OCF_SUCCESS
|
|
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
|
|
+ then
|
|
+ exit $OCF_SUCCESS
|
|
+ else
|
|
+ exit $OCF_ERR_GENERIC
|
|
+ fi
|
|
fi
|
|
|
|
if [ -n "$IP_CIP" ] && [ $ip_status = "no" ] || [ $ip_status = "partial2" ]; then
|
|
@@ -714,7 +719,12 @@ ip_start() {
|
|
fi
|
|
;;
|
|
esac
|
|
- exit $OCF_SUCCESS
|
|
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
|
|
+ then
|
|
+ exit $OCF_SUCCESS
|
|
+ else
|
|
+ exit $OCF_ERR_GENERIC
|
|
+ fi
|
|
}
|
|
|
|
ip_stop() {
|
|
@@ -788,7 +798,12 @@ ip_monitor() {
|
|
local ip_status=`ip_served`
|
|
case $ip_status in
|
|
ok)
|
|
- return $OCF_SUCCESS
|
|
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
|
|
+ then
|
|
+ return $OCF_SUCCESS
|
|
+ else
|
|
+ return $OCF_NOT_RUNNING
|
|
+ fi
|
|
;;
|
|
partial|no|partial2)
|
|
exit $OCF_NOT_RUNNING
|