diff --git a/RHEL-32265-3-IPaddr2-only-set-metric-value-for-IPv6-when-detected.patch b/RHEL-32265-3-IPaddr2-only-set-metric-value-for-IPv6-when-detected.patch new file mode 100644 index 0000000..fd16286 --- /dev/null +++ b/RHEL-32265-3-IPaddr2-only-set-metric-value-for-IPv6-when-detected.patch @@ -0,0 +1,22 @@ +From 4075aff88776e2811ebc83b735b2a70bcf46247f Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Mon, 24 Jun 2024 09:45:29 +0200 +Subject: [PATCH] IPaddr2: only set metric value for IPv6 when detected + +--- + heartbeat/IPaddr2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2 +index 091bea418..3bc5abec1 100755 +--- a/heartbeat/IPaddr2 ++++ b/heartbeat/IPaddr2 +@@ -690,7 +690,7 @@ add_interface () { + fi + + extra_opts="" +- if [ "$FAMILY" = "inet6" ]; then ++ if [ "$FAMILY" = "inet6" ] && [ -n "$metric" ]; then + extra_opts="$extra_opts metric $metric" + fi + if [ "$FAMILY" = "inet6" ] && ocf_is_true "${OCF_RESKEY_nodad}"; then diff --git a/RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch b/RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch new file mode 100644 index 0000000..a7cd5ed --- /dev/null +++ b/RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch @@ -0,0 +1,61 @@ +From 481672f73d05666ab20a883cf8fc746cb1f3050f Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 20 Jun 2024 09:29:21 +0200 +Subject: [PATCH] galera/mariadb/mysql/redis: remove Unpromoted monitor-action, + as it's covered by the regular monitor-action + +--- + heartbeat/galera.in | 1 - + heartbeat/mariadb.in | 1 - + heartbeat/mysql | 1 - + heartbeat/redis.in | 1 - + 4 files changed, 4 deletions(-) + +diff --git a/heartbeat/galera.in b/heartbeat/galera.in +index b518595cb0..b29d68bf73 100755 +--- a/heartbeat/galera.in ++++ b/heartbeat/galera.in +@@ -299,7 +299,6 @@ Use it with caution! (and fencing) + + + +- + + + +diff --git a/heartbeat/mariadb.in b/heartbeat/mariadb.in +index e0f1f3c9f1..1dca98ba68 100644 +--- a/heartbeat/mariadb.in ++++ b/heartbeat/mariadb.in +@@ -255,7 +255,6 @@ The port on which the Promoted MariaDB instance is listening. + + + +- + + + +diff --git a/heartbeat/mysql b/heartbeat/mysql +index 1df2fc0f28..6b00889ff4 100755 +--- a/heartbeat/mysql ++++ b/heartbeat/mysql +@@ -322,7 +322,6 @@ whether a node is usable for clients to read from. + + + +- + + + +diff --git a/heartbeat/redis.in b/heartbeat/redis.in +index 6429477e11..1e541f13d5 100755 +--- a/heartbeat/redis.in ++++ b/heartbeat/redis.in +@@ -221,7 +221,6 @@ is in use. + + + +- + + + diff --git a/resource-agents.spec b/resource-agents.spec index 024cb48..6621e77 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 59%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 60%{?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 @@ -126,9 +126,11 @@ Patch73: RHEL-24683-1-Filesystem-fail-leading-trailing-whitespace.patch Patch74: RHEL-24683-2-Filesystem-return-success-stop-action.patch Patch75: RHEL-32265-1-findif.sh-fix-corner-cases.patch Patch76: RHEL-32265-2-IPsrcaddr-add-IPv6-support.patch -Patch77: RHEL-40393-Filesystem-1-dont-kill-unrelated-processes.patch -Patch78: RHEL-40393-Filesystem-2-update-bsd-logic.patch -Patch79: RHEL-32829-db2-fix-OCF_SUCESS-typo.patch +Patch77: RHEL-32265-3-IPaddr2-only-set-metric-value-for-IPv6-when-detected.patch +Patch78: RHEL-40393-Filesystem-1-dont-kill-unrelated-processes.patch +Patch79: RHEL-40393-Filesystem-2-update-bsd-logic.patch +Patch80: RHEL-32829-db2-fix-OCF_SUCESS-typo.patch +Patch81: RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aws.patch @@ -332,6 +334,8 @@ exit 1 %patch -p1 -P 77 %patch -p1 -P 78 %patch -p1 -P 79 +%patch -p1 -P 80 +%patch -p1 -P 81 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -653,6 +657,13 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Fri Jun 28 2024 Oyvind Albrigtsen - 4.10.0-60 +- IPsrcaddr: add IPv6 support +- galera/mysql/redis: remove Unpromoted monitor-action + + Resolves: RHEL-32265 + Resolves: RHEL-43579 + * Tue Jun 25 2024 Oyvind Albrigtsen - 4.10.0-59 - Filesystem: fail when leading or trailing whitespace is present in device or directory parameters @@ -660,11 +671,9 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents Resolves: RHEL-24683 * Tue Jun 11 2024 Oyvind Albrigtsen - 4.10.0-58 -- IPsrcaddr: add IPv6 support - Filesystem: dont kill unrelated processes during stop-action - db2: fix OCF_SUCESS typo - Resolves: RHEL-32265 Resolves: RHEL-40393 Resolves: RHEL-32829 diff --git a/tests/tests.yml b/tests/tests.yml index 2fca136..c35dba9 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,8 +5,6 @@ - classic - container required_packages: - - resource-agents - - resource-agents-paf - ha-cloud-support - pcs