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

- portblock: add promotable and nftables support

Browse Source 
- build: make nfs-utils a weak dependency

  Resolves: RHEL-116149, RHEL-116152, RHEL-113500
This commit is contained in:
Oyvind Albrigtsen 2025-10-07 13:50:56 +02:00
parent 81f4afffd5
commit ff355ecfc9
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
RHEL-116149-1-portblock-add-promotable-support.patch → RHEL-116149-RHEL-116152-1-portblock-add-promotable-and-nftables-support.patch
View File

0
RHEL-116149-2-portblock-fix-incorrect-promotable-description.patch → RHEL-116149-RHEL-116152-2-portblock-fix-incorrect-promotable-description.patch
View File

25
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: 28%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 29%{?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
@ -86,8 +86,8 @@ Patch33: RHEL-102255-RHEL-102319-db2-add-skip_basic_sql_health_check-and-monitor
Patch34: RHEL-113817-podman-etcd-wrap-ipv6-address-in-brackets.patch
Patch35: RHEL-113816-podman-etcd-preserve-containers-for-debugging.patch
Patch36: RHEL-116205-podman-etcd-add-cluster-wide-force_new_cluster-attribute-check.patch
Patch37: RHEL-116149-1-portblock-add-promotable-support.patch
Patch38: RHEL-116149-2-portblock-fix-incorrect-promotable-description.patch
Patch37: RHEL-116149-RHEL-116152-1-portblock-add-promotable-and-nftables-support.patch
Patch38: RHEL-116149-RHEL-116152-2-portblock-fix-incorrect-promotable-description.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -157,7 +157,7 @@ Requires: /sbin/fsck
Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4
Requires: /usr/sbin/fsck.xfs
%if 0%{?fedora} > 40 || 0%{?rhel} > 9 || 0%{?suse_version}
Requires: /usr/sbin/mount.nfs /usr/sbin/mount.nfs4
Recommends: /usr/sbin/mount.nfs /usr/sbin/mount.nfs4
%else
Requires: /sbin/mount.nfs /sbin/mount.nfs4
%endif
@ -177,11 +177,19 @@ Requires: /usr/sbin/lvm
# nfsserver / netfs.sh
%if 0%{?fedora} > 40 || 0%{?rhel} > 9 || 0%{?suse_version}
Requires: /usr/sbin/rpc.statd
Recommends: /usr/sbin/rpc.statd
%else
%if 0%{?rhel} > 8
Recommends: /sbin/rpc.statd
%else
Requires: /sbin/rpc.statd
%endif
%endif
%if 0%{?fedora} > 40 || 0%{?rhel} > 8 || 0%{?suse_version}
Recommends: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd
%else
Requires: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd
%endif
# ocf.py
Requires: python3
@ -617,10 +625,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Thu Oct 2 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-28
- portblock: add promotable support
* Tue Oct 7 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-29
- portblock: add promotable and nftables support
- build: make nfs-utils a weak dependency
Resolves: RHEL-116149
Resolves: RHEL-116149, RHEL-116152, RHEL-113500
* Mon Sep 22 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-27
- podman-etcd: wrap ipv6 address in brackets