SLFO-pool/resource-agents
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: SLFO-pool:1.1
Branches Tags
SLFO-pool:main SLFO-pool:1.1
...
pull from: SLFO-pool:main
Branches Tags
SLFO-pool:main SLFO-pool:1.1

3 Commits
1.1 ... main

Author SHA256 Message Date
Adrian Schröter
7117631ca6 Sync from SUSE:SLFO:Main resource-agents revision cf15b1ab8f3b38dd142e7c6290c42598 2025-08-14 16:26:37 +02:00
Adrian Schröter
f037c4322a Sync from SUSE:SLFO:Main resource-agents revision 6f5690a42839c097218c31e2e09f84e9 2025-05-28 11:37:54 +02:00
Adrian Schröter
ae7d22af6e Sync from SUSE:SLFO:Main resource-agents revision 4b15c18ad247734cb13479eebdf6e5b9 2025-04-29 12:56:21 +02:00
7 changed files with 243 additions and 10 deletions
Expand all files Collapse all files

2
_servicedata
View File

@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/resource-agents.git</param>
<param name="changesrevision">8a3328c07d8e8f1cfe34dd37afaa5707dcafce9b</param>
<param name="changesrevision">968ad70124518348f8115fc414cf48bd1193e538</param>
</service>
</servicedata>

14
bsc-1241692.patch Normal file
View File

@@ -0,0 +1,14 @@
--- resource-agents-4.8.0+git30.d0077df0/heartbeat/db2.orig 2025-05-05 15:49:12.367621781 +0200
+++ resource-agents-4.8.0+git30.d0077df0/heartbeat/db2 2025-05-05 15:49:39.483844685 +0200
@@ -782,11 +782,6 @@ db2_promote() {
force="by force peer window only"
;;
- # must take over by force
- STANDBY/REMOTE_CATCHUP_PENDING/DISCONNECTED)
- force="by force"
- ;;
-
*)
return $OCF_ERR_GENERIC
esac

164
drop-deprecated-agents.patch
View File

@@ -1,5 +1,5 @@
--- resource-agents-4.16.0+git45.646a41d1/heartbeat/Makefile.am 2025-02-25 12:34:45.000000000 +0100
+++ resource-agents/heartbeat/Makefile.am 2025-03-19 10:05:33.459275593 +0100
--- a/heartbeat/Makefile.am.orig 2025-07-22 19:05:57.520867141 +0200
+++ b/heartbeat/Makefile.am 2025-07-22 19:06:36.125190546 +0200
@@ -50,94 +50,61 @@
send_ua_SOURCES = send_ua.c IPv6addr_utils.c
send_ua_LDADD = $(LIBNETLIBS)
@@ -110,12 +110,13 @@
oraasm \
oracle \
oralsnr \
@@ -157,38 +119,21 @@
@@ -157,39 +119,21 @@
ovsmonitor \
pgagent \
pgsql \
- pingd \
podman \
podman-etcd \
portblock \
postfix \
- pound \
@@ -127,7 +128,7 @@
rsyncd \
- rsyslog \
- scsi2reservation \
sfex \
- sfex \
sg_persist \
- mpathpersist \
- slapd \
@@ -153,3 +154,158 @@
if BUILD_AZURE_EVENTS_AZ
ocf_SCRIPTS += azure-events-az
--- resource-agents/doc/man/Makefile.am.orig 2025-07-24 07:12:57.504178731 +0200
+++ resource-agents/doc/man/Makefile.am 2025-07-24 07:21:55.135798301 +0200
@@ -77,69 +77,46 @@
# 12126 on savannah.gnu.org. But, maybe it gets fixed soon, it was
# first reported in 1995 and added to Savannah in in 2005...
if BUILD_DOC
-man_MANS = ocf_heartbeat_AoEtarget.7 \
- ocf_heartbeat_AudibleAlarm.7 \
- ocf_heartbeat_ClusterMon.7 \
- ocf_heartbeat_CTDB.7 \
+man_MANS = ocf_heartbeat_CTDB.7 \
ocf_heartbeat_Delay.7 \
ocf_heartbeat_Dummy.7 \
- ocf_heartbeat_EvmsSCC.7 \
- ocf_heartbeat_Evmsd.7 \
ocf_heartbeat_Filesystem.7 \
- ocf_heartbeat_ICP.7 \
- ocf_heartbeat_IPaddr.7 \
ocf_heartbeat_IPaddr2.7 \
ocf_heartbeat_IPsrcaddr.7 \
ocf_heartbeat_LVM.7 \
ocf_heartbeat_LVM-activate.7 \
- ocf_heartbeat_LinuxSCSI.7 \
ocf_heartbeat_MailTo.7 \
- ocf_heartbeat_ManageRAID.7 \
- ocf_heartbeat_ManageVE.7 \
ocf_heartbeat_NodeUtilization.7 \
- ocf_heartbeat_Pure-FTPd.7 \
ocf_heartbeat_Raid1.7 \
ocf_heartbeat_Route.7 \
ocf_heartbeat_SAPDatabase.7 \
ocf_heartbeat_SAPInstance.7 \
ocf_heartbeat_SendArp.7 \
- ocf_heartbeat_ServeRAID.7 \
- ocf_heartbeat_SphinxSearchDaemon.7 \
ocf_heartbeat_Squid.7 \
ocf_heartbeat_Stateful.7 \
- ocf_heartbeat_SysInfo.7 \
- ocf_heartbeat_VIPArip.7 \
ocf_heartbeat_VirtualDomain.7 \
ocf_heartbeat_WAS.7 \
ocf_heartbeat_WAS6.7 \
- ocf_heartbeat_WinPopup.7 \
- ocf_heartbeat_Xen.7 \
ocf_heartbeat_Xinetd.7 \
ocf_heartbeat_ZFS.7 \
ocf_heartbeat_aliyun-vpc-move-ip.7 \
ocf_heartbeat_anything.7 \
ocf_heartbeat_apache.7 \
- ocf_heartbeat_asterisk.7 \
ocf_heartbeat_aws-vpc-move-ip.7 \
ocf_heartbeat_aws-vpc-route53.7 \
ocf_heartbeat_awseip.7 \
ocf_heartbeat_awsvip.7 \
ocf_heartbeat_azure-lb.7 \
- ocf_heartbeat_clvm.7 \
- ocf_heartbeat_conntrackd.7 \
ocf_heartbeat_corosync-qnetd.7 \
ocf_heartbeat_crypt.7 \
ocf_heartbeat_db2.7 \
ocf_heartbeat_dhcpd.7 \
ocf_heartbeat_docker.7 \
ocf_heartbeat_docker-compose.7 \
- ocf_heartbeat_dovecot.7 \
ocf_heartbeat_dnsupdate.7 \
ocf_heartbeat_dummypy.7 \
- ocf_heartbeat_eDir88.7 \
ocf_heartbeat_ethmonitor.7 \
ocf_heartbeat_exportfs.7 \
- ocf_heartbeat_fio.7 \
ocf_heartbeat_galera.7 \
ocf_heartbeat_garbd.7 \
ocf_heartbeat_gcp-ilb.7 \
@@ -149,23 +126,12 @@
ocf_heartbeat_iface-bridge.7 \
ocf_heartbeat_iface-macvlan.7 \
ocf_heartbeat_iface-vlan.7 \
- ocf_heartbeat_ipsec.7 \
- ocf_heartbeat_ids.7 \
- ocf_heartbeat_iscsi.7 \
- ocf_heartbeat_jboss.7 \
- ocf_heartbeat_jira.7 \
- ocf_heartbeat_kamailio.7 \
ocf_heartbeat_lvmlockd.7 \
- ocf_heartbeat_lxc.7 \
- ocf_heartbeat_lxd-info.7 \
- ocf_heartbeat_machine-info.7 \
ocf_heartbeat_mariadb.7 \
ocf_heartbeat_mdraid.7 \
- ocf_heartbeat_minio.7 \
ocf_heartbeat_mpathpersist.7 \
ocf_heartbeat_mysql.7 \
ocf_heartbeat_mysql-proxy.7 \
- ocf_heartbeat_nagios.7 \
ocf_heartbeat_named.7 \
ocf_heartbeat_nfsnotify.7 \
ocf_heartbeat_nfsserver.7 \
@@ -174,10 +140,6 @@
ocf_heartbeat_nvmet-namespace.7 \
ocf_heartbeat_nvmet-port.7 \
ocf_heartbeat_openstack-info.7 \
- ocf_heartbeat_ocivip.7 \
- ocf_heartbeat_openstack-cinder-volume.7 \
- ocf_heartbeat_openstack-floating-ip.7 \
- ocf_heartbeat_openstack-virtual-ip.7 \
ocf_heartbeat_oraasm.7 \
ocf_heartbeat_oracle.7 \
ocf_heartbeat_oralsnr.7 \
@@ -185,42 +147,25 @@
ocf_heartbeat_ovsmonitor.7 \
ocf_heartbeat_pgagent.7 \
ocf_heartbeat_pgsql.7 \
- ocf_heartbeat_pingd.7 \
ocf_heartbeat_podman.7 \
ocf_heartbeat_podman-etcd.7 \
ocf_heartbeat_portblock.7 \
ocf_heartbeat_postfix.7 \
- ocf_heartbeat_pound.7 \
- ocf_heartbeat_proftpd.7 \
ocf_heartbeat_rabbitmq-cluster.7 \
ocf_heartbeat_rabbitmq-server-ha.7 \
ocf_heartbeat_redis.7 \
- ocf_heartbeat_rkt.7 \
ocf_heartbeat_rsyncd.7 \
- ocf_heartbeat_rsyslog.7 \
- ocf_heartbeat_scsi2reservation.7 \
- ocf_heartbeat_sfex.7 \
- ocf_heartbeat_slapd.7 \
- ocf_heartbeat_smb-share.7 \
- ocf_heartbeat_sybaseASE.7 \
ocf_heartbeat_sg_persist.7 \
ocf_heartbeat_storage-mon.7 \
- ocf_heartbeat_symlink.7 \
- ocf_heartbeat_syslog-ng.7 \
- ocf_heartbeat_tomcat.7 \
- ocf_heartbeat_varnish.7 \
- ocf_heartbeat_vdo-vol.7 \
- ocf_heartbeat_vmware.7 \
- ocf_heartbeat_vsftpd.7 \
- ocf_heartbeat_zabbixserver.7
+ ocf_heartbeat_symlink.7
if USE_IPV6ADDR_AGENT
man_MANS += ocf_heartbeat_IPv6addr.7
endif
-if BUILD_AZURE_EVENTS
-man_MANS += ocf_heartbeat_azure-events.7
-endif
+#if BUILD_AZURE_EVENTS
+#man_MANS += ocf_heartbeat_azure-events.7
+#endif
if BUILD_AZURE_EVENTS_AZ
man_MANS += ocf_heartbeat_azure-events-az.7

BIN
resource-agents-4.16.0+git45.646a41d1.tar.xz LFS
View File

Binary file not shown.

BIN
resource-agents-4.16.0+git90.968ad701.tar.xz LFS Normal file
View File

Binary file not shown.

60
resource-agents.changes
View File

@@ -1,3 +1,63 @@
-------------------------------------------------------------------
Thu Jul 24 07:38:20 UTC 2025 - Peter Varkoly <varkoly@suse.com>
- Update to version 4.16.0+git90.968ad701:
* OCPBUGS-58324: podman-etcd Add OOM score adjustment for etcd containers
* ocf-shellfuncs: remove extra sleep from curl_retry (#2058)
* Filesystem: remove validate-all fstype check, as there isnt a reliable and portable way to check
* IPaddr2: add link status DOWN/LOWERLAYERDOWN check
* ocf-shellfuncs: set SHELL to default shell if it's set to nologin
* mariadb: add SSL/TLS-Support (#2045)
* findif.sh: fix to avoid duplicate route issues
* podman-etcd: fix listen-peer-urls binding (#2049)
* azure-events-az: Update Deployment info section
* azure-events: backport relevant changes from azure-events-az
- Remove unsupported RAs from resource-agents package
Remove man pages of unsupported RAs from resource-agents package
Adapt drop-deprecated-agents.patch (jsc#PED-8737)
- Move %{_usr}/lib/ocf/resource.d/heartbeat/ldirectord into the
package ldirectord
-------------------------------------------------------------------
Tue May 13 10:25:43 UTC 2025 - varkoly@suse.com
- L3: DB2 resource agent forcefully shuts down database, risking data loss — ref:_00D1igLOd._500TrYJM7l:ref
(bsc#1241692)
Add patch:
bsc-1241692.patch
- Update to version 4.16.0+git73.99f301e1:
* azure-events-az: Update wording in log line
* podman-etcd: remove unused actions from metadata
* Filesystem: fix getting the wrong block device when doing grep (bsc#1241867)
* crypt: fix crypt_type check, and usage when action has not been specified
* podman-etcd: new resource agent (#2023)
* IPaddr2: fix iface_altname indentation
* IPaddr2: add support for network interfaces altname in the monitor operation (#2027)
* tomcat: only log "validate_all_tomcat[$TOMCAT_NAME]" on debug-level
* mdraid: Add 'auto' and multiple devices support to parameter md_dev (bsc#1200867, jsc#TEAM-6691)
* azure-events-az: Add params defaults to RA description (#2034)
* azure-events-az: Update crm_attribute call in putNodeOnline (#2033)
* azure-events-az: remove unused attr_globalPullState variable (#2032)
* azure-events-az: fix typo (#2031)
* azure-events-az: change variable name allNodesStopped to allResourcesNowStopped (#2030)
* tomcat: fix catalina_base and catalina_out parameter defaults
* tomcat: fix CATALINA_PID not set issue
* crypt: fixes to validate-action and to avoid running as a cloned resource
* Attempting to detect clevis automatically
* initial pass on supporting clevis-unlocked volumes
Remove: 2037.patch
-------------------------------------------------------------------
Tue Apr 22 05:19:47 UTC 2025 - Peter Varkoly <varkoly@suse.com>
- Failed action that lead to stonith when there is a empty /etc/mdadm.conf on one node on cluster MD
(bsc#1200867)
cluster-md: RA mdraid to support auto-assembly at the cluster level, eg md_dev="auto"
(jsc#TEAM-6691)
Apply upstream patch:
2037.patch
-------------------------------------------------------------------
Wed Mar 19 09:06:00 UTC 2025 - Peter Varkoly <varkoly@suse.com>

7
resource-agents.spec
View File

@@ -17,7 +17,7 @@
Name: resource-agents
Version: 4.16.0+git45.646a41d1
Version: 4.16.0+git90.968ad701
Release: 0
Summary: HA Reusable Cluster Resource Scripts
License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later
@@ -36,12 +36,12 @@ Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
%if "%{python_flavor}" == "python311"
Patch7: use-python-311.patch
%endif
Patch8: nfsnotify.patch
Patch9: portblock.patch
# PATCH-FIX-OPENSUSE: Remove deprecated perl-IO-Socket-INET6 dependency
Patch10: resource-agents-deprecate-INET6.patch
Patch11: bsc-1241692.patch
BuildRequires: %{python_module requests}
BuildRequires: %{python_module urllib3}
@@ -119,6 +119,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
%patch -P 8 -p0
%patch -P 9 -p0
%patch -P 10 -p1
%patch -P 11 -p1
%build
autoreconf -fvi
@@ -190,6 +191,7 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
%service_add_pre ldirectord.service
%files
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ldirectord
%defattr(-,root,root)
%dir %{_prefix}/lib/ocf
%dir %{_prefix}/lib/ocf/resource.d
@@ -244,6 +246,7 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
%{_sbindir}/rcldirectord
%exclude %{_sysconfdir}/init.d/ldirectord
%{_sysconfdir}/ha.d/resource.d/ldirectord
%{_usr}/lib/ocf/resource.d/heartbeat/ldirectord
%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
%changelog