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-avoid-failing-svc-if-down.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fcluster-resource-agents%2Fresource-agents%2Fstx%2Fipaddr2-avoid-failing-svc-if-down.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=60ac5705abf8fb7452eff6b936ca10ffcd462255;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/stx/ipaddr2-avoid-failing-svc-if-down.patch b/meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/stx/ipaddr2-avoid-failing-svc-if-down.patch
deleted file mode 100644
index 60ac570..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents/stx/ipaddr2-avoid-failing-svc-if-down.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c3448b1536d50291dc5ca49dce5957c39403cc82 Mon Sep 17 00:00:00 2001
-From: Bin Qian <bin.qian@windriver.com>
-Date: Wed, 29 Aug 2018 11:00:22 -0400
-Subject: [PATCH 1/1] avoid failing service when I/F is down
-
----
- heartbeat/IPaddr2 | 24 ++++++------------------
- 1 file changed, 6 insertions(+), 18 deletions(-)
-
-diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
-index 86009b9..2da5c5e 100755
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -968,12 +968,8 @@ ip_start() {
- 		then
- 			exit $OCF_SUCCESS
- 		else
--			if [ "$OCF_RESKEY_dc" = "yes" ]; then
--				ocf_log info "NIC $NIC is DOWN..."
--				exit $OCF_SUCCESS
--			else
--				exit $OCF_ERR_GENERIC
--			fi
-+			ocf_log info "NIC $NIC is DOWN..."
-+			exit $OCF_SUCCESS
- 		fi
- 	fi
- 	
-@@ -1037,12 +1033,8 @@ ip_start() {
- 	then
- 		exit $OCF_SUCCESS
- 	else
--		if [ "$OCF_RESKEY_dc" = "yes" ]; then
--			ocf_log info "NIC $NIC is DOWN"
--			exit $OCF_SUCCESS
--		else
--			exit $OCF_ERR_GENERIC
--		fi
-+		ocf_log info "NIC $NIC is DOWN"
-+		exit $OCF_SUCCESS
- 	fi
- }
- 
-@@ -1123,12 +1115,8 @@ ip_monitor() {
- 		then
- 			return $OCF_SUCCESS
- 		else
--			if [ "$OCF_RESKEY_dc" = "yes" ]; then
--				ocf_log info "NIC $NIC is DOWN"
--				return $OCF_SUCCESS
--			else
--				return $OCF_NOT_RUNNING
--			fi
-+			ocf_log info "NIC $NIC is DOWN"
-+			exit $OCF_SUCCESS
- 		fi
- 		;;
- 	partial|no|partial2)
--- 
-1.8.3.1
-