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>
59 lines
1.5 KiB
Diff
59 lines
1.5 KiB
Diff
From 573f0835621c5e64c6270260f607624aea29d21a Mon Sep 17 00:00:00 2001
|
|
From: Bin Qian <bin.qian@windriver.com>
|
|
Date: Sat, 21 Jan 2017 02:36:39 -0500
|
|
Subject: [PATCH 1/1] ipaddr2_if_down
|
|
|
|
---
|
|
heartbeat/IPaddr2 | 21 ++++++++++++++++++---
|
|
1 file changed, 18 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
|
|
index 67a7ca3..2cd822d 100755
|
|
--- a/heartbeat/IPaddr2
|
|
+++ b/heartbeat/IPaddr2
|
|
@@ -884,7 +884,12 @@ ip_start() {
|
|
then
|
|
exit $OCF_SUCCESS
|
|
else
|
|
- exit $OCF_ERR_GENERIC
|
|
+ if [ "$OCF_RESKEY_dc" = "yes" ]; then
|
|
+ ocf_log info "NIC $NIC is DOWN..."
|
|
+ exit $OCF_SUCCESS
|
|
+ else
|
|
+ exit $OCF_ERR_GENERIC
|
|
+ fi
|
|
fi
|
|
fi
|
|
|
|
@@ -948,7 +953,12 @@ ip_start() {
|
|
then
|
|
exit $OCF_SUCCESS
|
|
else
|
|
- exit $OCF_ERR_GENERIC
|
|
+ if [ "$OCF_RESKEY_dc" = "yes" ]; then
|
|
+ ocf_log info "NIC $NIC is DOWN"
|
|
+ exit $OCF_SUCCESS
|
|
+ else
|
|
+ exit $OCF_ERR_GENERIC
|
|
+ fi
|
|
fi
|
|
}
|
|
|
|
@@ -1029,7 +1039,12 @@ ip_monitor() {
|
|
then
|
|
return $OCF_SUCCESS
|
|
else
|
|
- return $OCF_NOT_RUNNING
|
|
+ if [ "$OCF_RESKEY_dc" = "yes" ]; then
|
|
+ ocf_log info "NIC $NIC is DOWN"
|
|
+ return $OCF_SUCCESS
|
|
+ else
|
|
+ return $OCF_NOT_RUNNING
|
|
+ fi
|
|
fi
|
|
;;
|
|
partial|no|partial2)
|
|
--
|
|
1.9.1
|
|
|