- IPaddr2: dont return OCF_ERR_INSTALLED during monitor
- aws-vpc-move-ip: add awscli_timeout parameter Resolves: RHEL-180734, RHEL-162108
This commit is contained in:
Oyvind Albrigtsen
parent
78871e7bdb
commit
6931fa8733
@ -0,0 +1,81 @@
|
||||
From fd1c9a1cfd4463dad843f666ad951e6616f1ccf0 Mon Sep 17 00:00:00 2001
|
||||
From: Guilherme Felix <fguilher@amazon.com>
|
||||
Date: Mon, 23 Mar 2026 19:22:49 +0000
|
||||
Subject: [PATCH 1/2] aws-vpc-move-ip: Add awscli_timeout option
|
||||
|
||||
---
|
||||
heartbeat/aws-vpc-move-ip | 16 +++++++++++++++-
|
||||
1 file changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip
|
||||
index 2afc0ba53..3e798173f 100755
|
||||
--- a/heartbeat/aws-vpc-move-ip
|
||||
+++ b/heartbeat/aws-vpc-move-ip
|
||||
@@ -48,6 +48,7 @@ OCF_RESKEY_interface_default="eth0"
|
||||
OCF_RESKEY_iflabel_default=""
|
||||
OCF_RESKEY_monapi_default="false"
|
||||
OCF_RESKEY_lookup_type_default="InstanceId"
|
||||
+OCF_RESKEY_awscli_timeout_default=""
|
||||
|
||||
: ${OCF_RESKEY_awscli=${OCF_RESKEY_awscli_default}}
|
||||
: ${OCF_RESKEY_auth_type=${OCF_RESKEY_auth_type_default}}
|
||||
@@ -61,6 +62,7 @@ OCF_RESKEY_lookup_type_default="InstanceId"
|
||||
: ${OCF_RESKEY_iflabel=${OCF_RESKEY_iflabel_default}}
|
||||
: ${OCF_RESKEY_monapi=${OCF_RESKEY_monapi_default}}
|
||||
: ${OCF_RESKEY_lookup_type=${OCF_RESKEY_lookup_type_default}}
|
||||
+: ${OCF_RESKEY_awscli_timeout=${OCF_RESKEY_awscli_timeout_default}}
|
||||
#######################################################################
|
||||
|
||||
|
||||
@@ -211,6 +213,14 @@ curl sleep between tries
|
||||
<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" />
|
||||
</parameter>
|
||||
|
||||
+<parameter name="awscli_timeout" unique="0">
|
||||
+<longdesc lang="en">
|
||||
+awscli cli-connect-timeout value
|
||||
+</longdesc>
|
||||
+<shortdesc lang="en">awscli cli-connect-timeout</shortdesc>
|
||||
+<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" />
|
||||
+</parameter>
|
||||
+
|
||||
</parameters>
|
||||
|
||||
<actions>
|
||||
@@ -490,7 +500,11 @@ if ! ocf_is_root; then
|
||||
exit $OCF_ERR_PERM
|
||||
fi
|
||||
|
||||
-AWSCLI_CMD="${OCF_RESKEY_awscli}"
|
||||
+if [ -n "${OCF_RESKEY_awscli_timeout}" ]; then
|
||||
+ AWSCLI_CMD="${OCF_RESKEY_awscli} --cli-connect-timeout ${OCF_RESKEY_awscli_timeout}"
|
||||
+else
|
||||
+ AWSCLI_CMD="${OCF_RESKEY_awscli}"
|
||||
+fi
|
||||
if [ "x${OCF_RESKEY_auth_type}" = "xkey" ]; then
|
||||
AWSCLI_CMD="$AWSCLI_CMD --profile ${OCF_RESKEY_profile}"
|
||||
elif [ "x${OCF_RESKEY_auth_type}" = "xrole" ]; then
|
||||
|
||||
From be4ad4dc4978875717b84b847bcd39386405bf51 Mon Sep 17 00:00:00 2001
|
||||
From: Guilherme Felix <fguilher@amazon.com>
|
||||
Date: Tue, 24 Mar 2026 16:08:41 +0000
|
||||
Subject: [PATCH 2/2] aws-vpc-move-ip: Fix error in default value for
|
||||
awscli_timeout
|
||||
|
||||
---
|
||||
heartbeat/aws-vpc-move-ip | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip
|
||||
index 3e798173f..1348c5908 100755
|
||||
--- a/heartbeat/aws-vpc-move-ip
|
||||
+++ b/heartbeat/aws-vpc-move-ip
|
||||
@@ -218,7 +218,7 @@ curl sleep between tries
|
||||
awscli cli-connect-timeout value
|
||||
</longdesc>
|
||||
<shortdesc lang="en">awscli cli-connect-timeout</shortdesc>
|
||||
-<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" />
|
||||
+<content type="integer" default="${OCF_RESKEY_awscli_timeout_default}" />
|
||||
</parameter>
|
||||
|
||||
</parameters>
|
||||
@ -0,0 +1,28 @@
|
||||
From ab77b1df5f2c98ff8461b8819052000997cb4b52 Mon Sep 17 00:00:00 2001
|
||||
From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
|
||||
Date: Mon, 1 Jun 2026 20:00:27 +0900
|
||||
Subject: [PATCH] Mid: IPaddr2: To allow Pacemaker to handle error handling, it
|
||||
returns NOT_RUNNING even when down.
|
||||
|
||||
---
|
||||
heartbeat/IPaddr2 | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
|
||||
index 462d8db5a..7953a5596 100755
|
||||
--- a/heartbeat/IPaddr2
|
||||
+++ b/heartbeat/IPaddr2
|
||||
@@ -1256,12 +1256,9 @@ ip_monitor() {
|
||||
run_arp_sender refresh
|
||||
return $OCF_SUCCESS
|
||||
;;
|
||||
- no)
|
||||
+ no|down)
|
||||
exit $OCF_NOT_RUNNING
|
||||
;;
|
||||
- down)
|
||||
- exit $OCF_ERR_INSTALLED
|
||||
- ;;
|
||||
*)
|
||||
# Errors on this interface?
|
||||
return $OCF_ERR_GENERIC
|
||||
@ -45,7 +45,7 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.10.0
|
||||
Release: 121%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 122%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
@ -215,6 +215,8 @@ Patch162: RHEL-177845-podman-etcd-fix-learner-start-deadlock.patch
|
||||
Patch163: RHEL-150842-pgsqlms-use-monitor_user-for-monitor-calls-and-use-pgpass-when-monitor_password-is-not-specified.patch
|
||||
Patch164: RHEL-179069-IPaddr2-fix-interfaces-named-with-keywords.patch
|
||||
Patch165: RHEL-173130-iSCSILogicalUnit-add-block-size-override-and-backstore-type-selection.patch
|
||||
Patch166: RHEL-180734-IPaddr2-dont-return-OCF_ERR_INSTALLED-during-monitor.patch
|
||||
Patch167: RHEL-162108-aws-vpc-move-ip-add-awscli_timeout-parameter.patch
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
Patch500: ha-cloud-support-aliyun.patch
|
||||
@ -525,6 +527,8 @@ exit 1
|
||||
%patch -p1 -P 163
|
||||
%patch -p1 -P 164
|
||||
%patch -p1 -P 165
|
||||
%patch -p1 -P 166
|
||||
%patch -p1 -P 167
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
%patch -p1 -P 500
|
||||
@ -859,6 +863,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Tue Jun 2 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-122
|
||||
- IPaddr2: dont return OCF_ERR_INSTALLED during monitor
|
||||
- aws-vpc-move-ip: add awscli_timeout parameter
|
||||
|
||||
Resolves: RHEL-180734, RHEL-162108
|
||||
|
||||
* Mon Jun 01 2026 Arslan Ahmad <arahmad@redhat.com> - 4.10.0-121
|
||||
- pgsqlms: use monitor_user for monitor-calls and use .pgpass when
|
||||
monitor_password is not specified
|
||||
|
||||
Loading…
Reference in New Issue
Block a user