- podman-etcd: new resource agent

- Filesystem: avoid chance of getting the wrong bind mount

  Resolves: RHEL-88431, RHEL-88538

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

@@ -0,0 +1,31 @@
+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

RHEL-88538-Filesystem-avoid-chance-of-getting-the-wrong-bind-mount.patch

@@ -0,0 +1,32 @@
+From 843c3b6f3bc4d2d60fd2c4dccbf00c10f29c5894 Mon Sep 17 00:00:00 2001
+From: Lidong Zhong <lidong.zhong@suse.com>
+Date: Fri, 25 Apr 2025 14:24:41 +0800
+Subject: [PATCH] Filesystem: fix getting the wrong block device when doing
+ grep
+
+If we have such a filesystem structure mounted in our cluster
+/dev/drbd50     /export/prq/upgrade_emspq       xfs
+/dev/drbd55     /export/prq/upgrade_sharedmsb   xfs
+/dev/drbd1      /export/devAGN/share    xfs
+/dev/drbd5      /export/dev/archivesn1agn       xfs
+
+When we want to stop the filesystem mounted on
+/export/dev/archivesn1agn, we probably will get the wrong entry returned
+here and thus will try to stop the wrong target.
+---
+ heartbeat/Filesystem | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index 0c43220df..d10e5a714 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -408,7 +408,7 @@ list_bindmounts() {
+ 	fi
+ 
+ 	if [ -b "$mount_disk" ]; then
+-		list_mounts | grep "$mount_disk" | grep -v "$match_string" | cut -d"$TAB" -f2 | sort -r
++		list_mounts | grep -w "$mount_disk" | grep -v "$match_string" | cut -d"$TAB" -f2 | sort -r
+ 	fi
+ }
+ 

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.16.0
-Release:	14%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	15%{?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
@@ -71,6 +71,9 @@ Patch18:	RHEL-85057-1-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.pat
 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
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -251,6 +254,9 @@ exit 1
 %patch -p1 -P 19
 %patch -p1 -P 20
 %patch -p1 -P 21
+%patch -p1 -P 22
+%patch -p1 -P 23 -F1
+%patch -p1 -P 24
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -581,6 +587,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Mon Apr 28 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-15
+- podman-etcd: new resource agent
+- Filesystem: avoid chance of getting the wrong bind mount
+
+  Resolves: RHEL-88431, RHEL-88538
+
 * Thu Apr 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-14
 - crypt: new resource agent