resource-agents/Fix-PRIMARY_IFACE-variable.patch

27 lines
943 B
Diff
Raw Permalink Normal View History

2023-10-27 17:31:46 +08:00
From 51d252f46df079460eb21d282e2390f0ad9c5ff8 Mon Sep 17 00:00:00 2001
From: Lorenzo Garuti <garuti.lorenzo@gmail.com>
Date: Wed, 25 Oct 2023 09:51:14 +0000
Subject: [PATCH] Fix PRIMARY_IFACE variable. In some cases ip returns two
lines
---
heartbeat/ocivip | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/ocivip b/heartbeat/ocivip
index 053646dc..f146807d 100755
--- a/heartbeat/ocivip
+++ b/heartbeat/ocivip
@@ -221,7 +221,7 @@ SECONDARY_PRIVATE_IP="${OCF_RESKEY_secondary_private_ip}"
CIDR_NETMASK="${OCF_RESKEY_cidr_netmask}"
INTERFACE_ALIAS="${OCF_RESKEY_interface_alias}"
VNIC_ID="$(curl -s -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/vnics/ | jq -r '.[0].vnicId')"
-PRIMARY_IFACE=$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)')
+PRIMARY_IFACE=$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -n1)
case $__OCF_ACTION in
start)
--
2.25.1