X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fcluster-resource-agents%2Fresource-agents%2Fstx%2Fipaddr2_if_down.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fcluster-resource-agents%2Fresource-agents%2Fstx%2Fipaddr2_if_down.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=40c10c52f8d04c2c9131684cd5c6e88dff8f08f4;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/stx/ipaddr2_if_down.patch b/meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/stx/ipaddr2_if_down.patch
deleted file mode 100644
index 40c10c5..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/stx/ipaddr2_if_down.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-@@ -968,7 +968,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
- 	
-@@ -1032,7 +1037,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
- }
- 
-@@ -1113,7 +1123,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
-