rpms/resource-agents
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- revert "podman-etcd: new resource agent"

Browse Source 
Reverts: RHEL-88431
This commit is contained in:
Oyvind Albrigtsen 2025-06-18 14:51:30 +02:00
parent 0968f74b41
commit 3755408de2
4 changed files with 5 additions and 1726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1643
RHEL-88431-1-podman-etcd-new-ra.patch
View File

File diff suppressed because it is too large Load Diff

31
RHEL-88431-2-podman-etcd-remove-unused-actions-from-metadata.patch
View File

@ -1,31 +0,0 @@
From 6a3249aae260c081ccbcfd09444d5d85ebc4e3b3 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 28 Apr 2025 15:48:29 +0200
Subject: [PATCH] podman-etcd: remove unused actions from metadata
---
heartbeat/podman-etcd | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/heartbeat/podman-etcd b/heartbeat/podman-etcd
index 514dd2e5b..3a2323260 100755
--- a/heartbeat/podman-etcd
+++ b/heartbeat/podman-etcd
@@ -236,8 +236,6 @@ to stop the container before pacemaker.
<action name="start" timeout="600s" />
<action name="stop" timeout="90s" />
<action name="monitor" timeout="25s" interval="30s" depth="0" />
-<action name="promote" timeout="300s" />
-<action name="demote" timeout="120s" />
<action name="meta-data" timeout="5s" />
<action name="validate-all" timeout="30s" />
</actions>
@@ -251,7 +249,7 @@ REQUIRE_IMAGE_PULL=0
podman_usage()
{
cat <<END
-usage: $0 {start|stop|monitor|promote|demote|validate-all|meta-data}
+usage: $0 {start|stop|monitor|validate-all|meta-data}
Expects to have a fully populated OCF RA-compliant environment set.
END

36
RHEL-88431-3-podman-etcd-fix-listen-peer-urls-binding.patch
View File

@ -1,36 +0,0 @@
From 5f7b9b045d4713e8ff27a4fc8b2799669c1b823a Mon Sep 17 00:00:00 2001
From: Carlo Lobrano <c.lobrano@gmail.com>
Date: Tue, 20 May 2025 09:34:03 +0200
Subject: [PATCH] podman-etcd: fix listen-peer-urls binding (#2049)
This change ensures learner etcd listens on all interfaces for peer
connections, resolving accessibility issues.
Fix: OCPBUGS-56447
---
heartbeat/podman-etcd | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/heartbeat/podman-etcd b/heartbeat/podman-etcd
index 3a2323260..6762112ec 100755
--- a/heartbeat/podman-etcd
+++ b/heartbeat/podman-etcd
@@ -436,15 +436,9 @@ prepare_env() {
ETCD_PEER_CERT=$(get_env_from_manifest "ETCDCTL_CERT")
ETCD_PEER_KEY=$(get_env_from_manifest "ETCDCTL_KEY")
- if is_learner; then
- LISTEN_CLIENT_URLS="$NODEIP"
- LISTEN_PEER_URLS="$NODEIP"
- LISTEN_METRICS_URLS="$NODEIP"
- else
- LISTEN_CLIENT_URLS="0.0.0.0"
- LISTEN_PEER_URLS="0.0.0.0"
- LISTEN_METRICS_URLS="0.0.0.0"
- fi
+ LISTEN_CLIENT_URLS="0.0.0.0"
+ LISTEN_PEER_URLS="0.0.0.0"
+ LISTEN_METRICS_URLS="0.0.0.0"
}
archive_data_folder()

21
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.16.0
Release: 17%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 18%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -72,11 +72,8 @@ Patch19: RHEL-85057-2-tomcat-log-validate-all-on-debug-level.patch
Patch20: RHEL-13089-1-crypt-add-tang-clevis-support-and-fix-issues.patch
Patch21: RHEL-13089-2-crypt-fix-crypt_type-check-and-usage.patch
Patch22: RHEL-88538-Filesystem-avoid-chance-of-getting-the-wrong-bind-mount.patch
Patch23: RHEL-88431-1-podman-etcd-new-ra.patch
Patch24: RHEL-88431-2-podman-etcd-remove-unused-actions-from-metadata.patch
Patch25: RHEL-88431-3-podman-etcd-fix-listen-peer-urls-binding.patch
Patch26: RHEL-93680-IPaddr2-IPsrcaddr-avoid-duplicate-route-issues.patch
Patch27: RHEL-85014-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch
Patch23: RHEL-93680-IPaddr2-IPsrcaddr-avoid-duplicate-route-issues.patch
Patch24: RHEL-85014-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -258,11 +255,8 @@ exit 1
%patch -p1 -P 20
%patch -p1 -P 21
%patch -p1 -P 22
%patch -p1 -P 23 -F1
%patch -p1 -P 23
%patch -p1 -P 24
%patch -p1 -P 25
%patch -p1 -P 26
%patch -p1 -P 27
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -593,17 +587,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Tue Jun 17 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-17
* Tue Jun 17 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-18
- IPaddr2/IPsrcaddr: fix to avoid duplicate route issues
- IPaddr2: add link status DOWN/LOWERLAYERDOWN check
Resolves: RHEL-93680, RHEL-85014
* Tue May 20 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-16
- podman-etcd: new resource agent
Resolves: RHEL-88431
* Mon Apr 28 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-15
- Filesystem: avoid chance of getting the wrong bind mount