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

Compare commits

base: SLFO-pool:1.1
Branches Tags
SLFO-pool:main SLFO-pool:1.1
..
compare: 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
11 changed files with 564 additions and 152 deletions
Expand all files Collapse all files

40
0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch
View File

@@ -1,40 +0,0 @@
From fa566f94cf5a491ce5f06e9b9edcc5d39edd05f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Thu, 18 May 2017 00:11:10 +0200
Subject: [PATCH 6/6] Revert "ocf_log: use same log format as pacemaker"
This reverts commit 75816393878bf063a8c3404b5c747868024e1097.
---
heartbeat/ocf-directories.in | 2 +-
heartbeat/ocf-shellfuncs.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in
index f734162e..7246e088 100644
--- a/heartbeat/ocf-directories.in
+++ b/heartbeat/ocf-directories.in
@@ -13,7 +13,7 @@ exec_prefix=@exec_prefix@
: ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo}
: ${HA_BIN:=@libdir@/heartbeat}
: ${HA_SBIN_DIR:=@sbindir@}
-: ${HA_DATEFMT:="%b %d %T "}
+: ${HA_DATEFMT:="%Y/%m/%d_%T "}
: ${HA_DEBUGLOG:=/dev/null}
: ${HA_RESOURCEDIR:=$HA_DIR/resource.d}
: ${HA_DOCDIR:=@datadir@/doc/heartbeat}
diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
index 4a74e201..a0716bb6 100644
--- a/heartbeat/ocf-shellfuncs.in
+++ b/heartbeat/ocf-shellfuncs.in
@@ -231,7 +231,7 @@ __ha_log() {
[ -n "$HA_LOGFILE" ]
then
: appending to $HA_LOGFILE
- echo `hadate`" $HA_LOGTAG: ${*}" >> $HA_LOGFILE
+ echo "$HA_LOGTAG: "`hadate`"${*}" >> $HA_LOGFILE
fi
if
[ -z "$HA_LOGFACILITY" -a -z "$HA_LOGFILE" ] && ! [ "$ignore_stderr" = "true" ]
--
2.12.2

27
0007-Request-to-add-gcp-vpc-move-route.patch
View File

@@ -1,27 +0,0 @@
--- configure.ac.orig 2022-10-25 07:51:48.911093203 +0200
+++ configure.ac 2022-10-25 07:53:34.987867250 +0200
@@ -530,24 +530,12 @@
AM_CONDITIONAL(BUILD_AZURE_EVENTS_AZ, test $BUILD_AZURE_EVENTS_AZ -eq 1)
BUILD_GCP_PD_MOVE=1
-if test -z "$PYTHON" || test $BUILD_OCF_PY -eq 0; then
- BUILD_GCP_PD_MOVE=0
- AC_MSG_WARN("Not building gcp-pd-move")
-fi
AM_CONDITIONAL(BUILD_GCP_PD_MOVE, test $BUILD_GCP_PD_MOVE -eq 1)
BUILD_GCP_VPC_MOVE_ROUTE=1
-if test -z "$PYTHON" || test "x${HAVE_PYMOD_PYROUTE2}" != xyes || test $BUILD_OCF_PY -eq 0; then
- BUILD_GCP_VPC_MOVE_ROUTE=0
- AC_MSG_WARN("Not building gcp-vpc-move-route")
-fi
AM_CONDITIONAL(BUILD_GCP_VPC_MOVE_ROUTE, test $BUILD_GCP_VPC_MOVE_ROUTE -eq 1)
BUILD_GCP_VPC_MOVE_VIP=1
-if test -z "$PYTHON" || test $BUILD_OCF_PY -eq 0; then
- BUILD_GCP_VPC_MOVE_VIP=0
- AC_MSG_WARN("Not building gcp-vpc-move-vip")
-fi
AM_CONDITIONAL(BUILD_GCP_VPC_MOVE_VIP, test $BUILD_GCP_VPC_MOVE_VIP -eq 1)
AC_PATH_PROGS(ROUTE, route)

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">34e51ac4a554a103f70c9ecb69b65236b7c8615d</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

306
drop-deprecated-agents.patch
View File

@@ -1,29 +1,311 @@
--- a/heartbeat/Makefile.am 2024-06-07 07:19:37.336355067 +0200
+++ b/heartbeat/Makefile.am 2024-06-07 08:43:49.674399158 +0200
@@ -60,10 +60,8 @@ ocf_SCRIPTS = AoEtarget \
Evmsd \
--- 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)
-ocf_SCRIPTS = AoEtarget \
- AudibleAlarm \
- ClusterMon \
- CTDB \
+ocf_SCRIPTS = CTDB \
Delay \
Dummy \
- EvmsSCC \
- Evmsd \
Filesystem \
ICP \
- ICP \
- IPaddr \
IPaddr2 \
IPsrcaddr \
- LVM \
LinuxSCSI \
LVM \
- LinuxSCSI \
lvmlockd \
LVM-activate \
@@ -137,7 +135,6 @@ ocf_SCRIPTS = AoEtarget \
minio \
MailTo \
- ManageRAID \
- ManageVE \
NodeUtilization \
- Pure-FTPd \
Raid1 \
Route \
SAPDatabase \
SAPInstance \
SendArp \
- ServeRAID \
- SphinxSearchDaemon \
Squid \
Stateful \
- SysInfo \
- VIPArip \
VirtualDomain \
WAS \
WAS6 \
- WinPopup \
- Xen \
Xinetd \
ZFS \
aliyun-vpc-move-ip \
anything \
apache \
- asterisk \
aws-vpc-move-ip \
aws-vpc-route53 \
awseip \
awsvip \
azure-lb \
- clvm \
- conntrackd \
corosync-qnetd \
crypt \
db2 \
dhcpd \
- dnsupdate \
+ dnsupdate \
dummypy \
docker \
docker-compose \
- dovecot \
- eDir88 \
ethmonitor \
exportfs \
- fio \
galera \
garbd \
gcp-ilb \
gcp-vpc-move-ip \
iSCSILogicalUnit \
iSCSITarget \
- ids \
iface-bridge \
iface-macvlan \
iface-vlan \
- ipsec \
- iscsi \
- jboss \
- jira \
- kamailio \
- lxc \
- lxd-info \
- machine-info \
mariadb \
mdraid \
- minio \
+ mpathpersist \
mysql \
mysql-proxy \
- nagios \
named \
nfsnotify \
nfsserver \
@@ -166,7 +163,6 @@ ocf_SCRIPTS = AoEtarget \
@@ -145,11 +112,6 @@
nvmet-subsystem \
nvmet-namespace \
nvmet-port \
- ocivip \
- openstack-cinder-volume \
- openstack-floating-ip \
- openstack-info \
- openstack-virtual-ip \
oraasm \
oracle \
oralsnr \
@@ -157,39 +119,21 @@
ovsmonitor \
pgagent \
pgsql \
- pingd \
podman \
podman-etcd \
portblock \
postfix \
- pound \
- proftpd \
rabbitmq-cluster \
rabbitmq-server-ha \
redis \
- rkt \
rsyncd \
rsyslog \
scsi2reservation \
- rsyslog \
- scsi2reservation \
- sfex \
sg_persist \
- mpathpersist \
- slapd \
- smb-share \
storage-mon \
- sybaseASE \
- symlink \
- syslog-ng \
- tomcat \
- varnish \
- vdo-vol \
- vmware \
- vsftpd \
- zabbixserver
+ symlink
-if BUILD_AZURE_EVENTS
-ocf_SCRIPTS += azure-events
-endif
+#if BUILD_AZURE_EVENTS
+#ocf_SCRIPTS += azure-events
+#endif
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
monitoring-plugins-metadata.tar.bz2 LFS
View File

Binary file not shown.

BIN
resource-agents-4.14.0+git15.c784b83c.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.

204
resource-agents.changes
View File

@@ -1,3 +1,205 @@
-------------------------------------------------------------------
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>
- Readd anything deleted by mistake. (jsc#PED-12354)
-------------------------------------------------------------------
Mon Mar 17 11:10:58 UTC 2025 - Peter Varkoly <varkoly@suse.com>
- Remove conntrackd RA (jsc#PED-12354)
-------------------------------------------------------------------
Tue Mar 11 15:24:39 UTC 2025 - Peter Varkoly <varkoly@suse.com>
- Adapt drop-deprecated-agents.patch according (jsc#PED-8737)
-------------------------------------------------------------------
Mon Mar 03 16:05:42 UTC 2025 - varkoly@suse.com
- Update to version 4.16.0+git45.646a41d1:
* portblock: use ocf_log() for logging
* simplify iptables version string regex
* Update portblock: improve version detection of iptables
* ocf-shellfuncs: add missing variable in crm_mon_no_validation()
-------------------------------------------------------------------
Tue Jan 28 15:57:41 UTC 2025 - Peter Varkoly <varkoly@suse.com>
- drop HA package cluster-glue and Linux-HA style fence agents in FrameworkOne
(jsc#PED-8498)
Remove dependency: cluster-glue-devel. As a result of this sfex_init, sfex_stat,
resource-agents-deps.target and ldirectord.service were removed also.
- Update to version 4.16.0+git38.da9ef4e2:
* storage-mon: log "storage_mon is already running" in start-action
* storage-mon: check if daemon is already running during start-action
* storage-mon: replace dashes with underscores in functions
* ocf-binaries: add FGREP
* Filesystem: dont report warnings when creating a Filesystem resource
* ibm-cloud-vpc-move-fip: new resource agent (#2008)
* ibm-cloud-vpc-cr-vip: fix ImportError logging
* All agents: use detected grep -E/-F instead of egrep/fgrep when detected
* ibm-cloud-vpc-cr-vip: dont build if ibm_cloud_fail_over is not installed
* nfsserver: dont use init-scripts if systemd is running
* ibm-cloud-vpc-cr-vip: new resource agent (#2002)
* ocf-shellfuncs: fixed bash systax error added at a25f08cf98d784894df9c52960eff5ccef059393
* openstack-cinder-volume: fix detach not working during start-action after #2000
* openstack-cinder-volume: wait for volume to be available
* spec: update Requires paths for RHEL10/CentOS 10
* awsvip: let user specify which interface to use, and make the parameter optional in aws-vpc-move-ip
* aws.sh: add get_interface_mac()
* Mid: storage-mon RA: Wait until monitor confirms the startup pid according to the OCF resource specification.
* High: storage-mon: Correct the timing of setting notification values to storage-mon(RA) clients.
* aws.sh/ocf-shellfuncs: add ability to fresh token if it's invalid
* aws.sh: chmod 600 $TOKEN_FILE, add get_instance_id() with DMI support, and use get_instance_id() in AWS agents
-------------------------------------------------------------------
Tue Nov 19 10:50:14 UTC 2024 - varkoly@suse.com
- Update to version 4.16.0+git2.20a433c3:
* storage_mon: remove unused macro variables (#1994)
* AWS agents: reuse IMDS token until it expires (issue #1990) (#1991)
* build: update ChangeLog for 4.16.0
* build: update ChangeLog for 4.16.0-rc1
* spec: drop BuildReq python3-pyroute2 for RHEL/CentOS
* Add azure aznfs filesystem support (bsc#1233083)
* powervs-subnet: dont require api_type as it has a default value
* IPaddr2: improve fail logic and check ip_status after adding IP
* azure-events*: use node name from cluster instead of hostname to avoid failing if they're not the same
* ocf-shellfuncs: systemd_drop_in only if needed
* findif.sh: remove "local proto" to use global proto from the agents
* nfsserver: also stop rpc-statd for nfsv4_only to avoid stop failing in some cases
-------------------------------------------------------------------
Tue Sep 24 19:03:38 UTC 2024 - varkoly@suse.com
- Update to version 4.15.1+git27.f2932e21:
* IPaddr2: add proto-parameter to be able to match a specific route
* Filesystem: stop/get_pids to be signaled
* Filesystem: on stop, try umount directly, before scanning for users
* docker-compose: use "docker compose" when not using older docker-compose command
* podman: Improve handling of "stopping" container removal in remove_container() (#1973)
* Filesystem: only use $umount_force after sending kill_signals
* apache/http-mon.sh: doc curl as preferred client
* apache/http-mon.sh: change curl opts to match wget
* powervs-subnet: Enable access via private endpoint for IBM IAM
* Filesystem: dont sleep during stop-action when there are no processes to kill
* IPsrcaddr: specify dev for default route, as e.g. fe80:: routes can be present on multiple interfaces
* powervs-subnet: Add optional argument route_table (#1966)
* findif.sh: ignore unreachable, blackhole, and prohibit routes
* powervs-subnet: Modify gathering of Apikey, calculation of timeout.
* azure-lb: fix spelling of adresses to addresses
* IPaddr2: Fix bringing up device
- Drop pacakge monitoring-plugins-metadata (jsc#PED-5577) (jsc#PED-8232)
-------------------------------------------------------------------
Wed Jul 31 08:21:14 UTC 2024 - Peter Varkoly <varkoly@suse.com>
- Remove unsupported RAs from resource-agents package
Adapt drop-deprecated-agents.patch (jsc#PED-8737)
- Normalize log format from RAs with one of Pacemaker (bsc#1217456)
Remove 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch
- Remove 0007-Request-to-add-gcp-vpc-move-route.patch adapt BuildRequires instead of:
Add python module requirements: pyroute2 requests urllib3
- Adapt configure if python flavor is python311:
add patch: use-python-311.patch
- Update to version 4.15.1+git0.a6ccb93a:
* build: update ChangeLog for 4.15.1
* IPaddr2: dont fail with "IPv4 does not support lvs_ipv6_addrlabel" error, as the parameter is not used in IPv4 scenarioes
* build: update ChangeLog for 4.15.0
* spec: use /usr/sbin paths for Fedora 41+
* build: dont build powervs-subnet if dependencies are missing
* build: update ChangeLog for 4.15.0-rc1
-------------------------------------------------------------------
Mon Jul 15 11:54:45 UTC 2024 - varkoly@suse.com
- Update to version 4.14.0+git46.eb83df84:
* send_arp.libnet: use calloc() to avoid truncating pidfilename if it is more than 64 chars long
* configure: fix enable_ansi check
* powervs-subnet resource agent: improvements on virtual server status collection, and subnet - port handling.
* ocf-shellfuncs: dont use deprecated validate-with="none" in CIB
* conntrackd/galera/rabbitmq-cluster: avoid deprecated tool options
* IPaddr2: change default for lvs_ipv6_addrlabel to true to avoid last added IP becoming src IP
* IPaddr2: only set metric value for IPv6 when detected
* galera/mariadb/mysql/redis: remove Unpromoted monitor-action, as it's covered by the regular monitor-action
* apache/http-mon.sh: prefer curl due to new wget2 issues, including not being able to resolve hostnames from /etc/hosts
* apache/http-mon.sh: dont use -L for wget2 as it's not implemented yet
* Filesystem: return success during stop-action when leading or trailing whitespace is present in device or directory parameters
* pgsql: pgsql_status: silence ERROR: command failed: runuser ...
* ocf-shellfuncs: ocf_run(): add debug level error logging
* powervs-subnet: new resource agent (#1948)
* Filesystem: for "probe", silence "Expected /dev/... to exist" message
* IPsrcaddr: add IPv6 support
* IPaddr2: use metric for IPv6
* findif.sh: add metric for IPv6 support and fail when matching more than 1 route
* Filesystem: use fuser -c on FreeBSD, as -m and -M are used for other functionality
* Fix #1944
-------------------------------------------------------------------
Wed Jun 12 08:33:22 UTC 2024 - Dirk Stoecker <opensuse@dstoecker.de>
- remove package name based perl requires
-------------------------------------------------------------------
Fri Jun 07 05:18:24 UTC 2024 - varkoly@suse.com
@@ -2999,5 +3201,3 @@ Wed Jul 29 12:00:00 UTC 2009 - abeekhof@suse.de
- Initial import of the resource-agents project after being split off
from Heartbeat (this package replaces heartbeat-resources).
- Upstream version cs: 3aa338887920

94
resource-agents.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package resource-agents
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
Name: resource-agents
Version: 4.14.0+git15.c784b83c
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
Group: Productivity/Clustering/HA
URL: http://linux-ha.org/
Source: resource-agents-%{version}.tar.xz
Source1: monitoring-plugins-metadata.tar.bz2
Patch1: drop-deprecated-agents.patch
# PATCH-FIX-OPENSUSE: fix path to sm-notify
@@ -33,27 +32,27 @@ Patch2: 0002-nfsserver-fix-path-to-sm-notify.patch
Patch3: 0003-ldirectord-don-t-create-subsys-lock.patch
# PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec
Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
%if 0%{?suse_version} < 1600
# PATCH-FIX-OPENSUSE: Revert ocf_log: use same log format at pacemaker
Patch6: 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch
## PATCH-FIX-OPENSUSE:
%if "%{python_flavor}" == "python311"
Patch7: use-python-311.patch
%endif
# PATCH-FIX-OPENSUSE:
Patch7: 0007-Request-to-add-gcp-vpc-move-route.patch
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}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cluster-glue-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_4
BuildRequires: libqb-devel
BuildRequires: libxslt
BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(glib-2.0)
Requires: /usr/bin/logger
@@ -78,6 +77,9 @@ Requires: %{name}
Provides: %{name}:%{_mandir}/man7/ocf_heartbeat_ZFS.*
Provides: %{name}:%{_prefix}/lib/ocf/resource.d/heartbeat/ZFS
%description zfs
Containing the resource agent and documentation for ZFS support
%package -n ldirectord
Summary: A Monitoring Daemon for Maintaining High Availability Resources
License: GPL-2.0-only AND LGPL-2.1-or-later
@@ -85,43 +87,25 @@ Group: Productivity/Clustering/HA
Requires: %{name}
Requires: ipvsadm
Requires: logrotate
Requires: perl-IO-Socket-IP
Requires: perl-MailTools
Requires: perl-Net-SSLeay
Requires: perl-Socket6
Requires: perl-libwww-perl
Requires: perl(IO::Socket::IP)
Requires: perl(LWP)
Requires: perl(MailTools)
Requires: perl(Net::SSLeay)
Requires: perl(Socket6)
Obsoletes: heartbeat-ldirectord
Provides: heartbeat-ldirectord
%{?systemd_requires}
%description zfs
Containing the resource agent and documentation for ZFS support
%description -n ldirectord
ldirectord is a stand-alone daemon for monitoring the services on real
The Linux Director Daemon (ldirectord) was written by Jacob Rief.
<jacob.rief@tiscover.com>
ldirectord is a stand alone daemon for monitoring the services on real
servers. Currently, HTTP, HTTPS, and FTP services are supported.
ldirectord works with the heartbeat code (http://www.linux-ha.org/).
ldirectord is simple to install and works with Pacemaker
(http://clusterlabs.org/).
See `ldirectord -h` and linux-ha/doc/ldirectord for more information.
%package -n monitoring-plugins-metadata
Summary: Metadata for Monitoring plugins
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Clustering/HA
Requires: monitoring-plugins-fping
Requires: monitoring-plugins-http
Requires: monitoring-plugins-ldap
Requires: monitoring-plugins-mysql
Requires: monitoring-plugins-pgsql
Requires: monitoring-plugins-tcp
Requires: resource-agents
Provides: nagios-plugins-metadata
BuildArch: noarch
%description -n monitoring-plugins-metadata
XML files containing metadata which facilitates using nagios
plugins as resource agents. These files were produced from help
pages of individual nagios plugins.
See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
%prep
%setup -q
@@ -129,18 +113,19 @@ pages of individual nagios plugins.
%patch -P 2 -p1
%patch -P 3 -p1
%patch -P 4 -p1
%if 0%{?suse_version} < 1600
%patch -P 6 -p1
%if "%{python_flavor}" == "python311"
%patch -P 7 -p1
%endif
%patch -P 7 -p0
%patch -P 8 -p0
%patch -P 9 -p0
%patch -P 10 -p1
%patch -P 11 -p1
%build
autoreconf -fvi
# because quilt push changed the permissions of sg_persist.
# chmod 775 heartbeat/sg_persist
export BUILD_AZURE_EVENTS=0
%configure \
--docdir=%{_defaultdocdir}/%{name} \
--with-ras-set=linux-ha \
@@ -172,13 +157,6 @@ do
done
)
# install nagios plugins XML metadata
tar -xjf %{SOURCE1}
mkdir -p %{buildroot}%{_datadir}/nagios/plugins-metadata
for file in $(find plugins-metadata -type f); do
install -m 644 $file %{buildroot}%{_datadir}/nagios/plugins-metadata
done
# Create a symlink for backward compat of suse:aws-vpc-move-ip
(
mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/suse
@@ -203,9 +181,6 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
%pre
%service_add_pre resource-agents-deps.target
%preun -n ldirectord
%service_del_preun ldirectord.service
%postun -n ldirectord
%service_del_postun ldirectord.service
@@ -216,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
@@ -239,10 +215,7 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
%{_prefix}/lib/ocf/lib/heartbeat
%{_sbindir}/ocf-tester
%{_sbindir}/ocft
%{_sbindir}/sfex_init
%{_sbindir}/sfex_stat
%{_includedir}/heartbeat
%{_unitdir}/resource-agents-deps.target
%ghost %dir %attr (1755, root, root) %{_rundir}/resource-agents
%doc AUTHORS
%license COPYING
@@ -252,7 +225,6 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
%{_mandir}/man7/*.7*
%exclude %{_mandir}/man7/ocf_heartbeat_ZFS.*
%{_mandir}/man8/ocf-tester.8*
%{_mandir}/man8/sfex_init.8*
%doc doc/README.webapps
# For compatability with pre-existing agents
%dir %{_sysconfdir}/ha.d
@@ -272,15 +244,9 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
%dir %{_sysconfdir}/ha.d/resource.d
%{_sbindir}/ldirectord
%{_sbindir}/rcldirectord
%{_unitdir}/ldirectord.service
%exclude %{_sysconfdir}/init.d/ldirectord
%{_sysconfdir}/ha.d/resource.d/ldirectord
%{_usr}/lib/ocf/resource.d/heartbeat/ldirectord
%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
%files -n monitoring-plugins-metadata
%defattr(-,root,root)
%dir %{_datadir}/nagios
%dir %{_datadir}/nagios/plugins-metadata
%attr(0644,root,root) %{_datadir}/nagios/plugins-metadata/*
%changelog

20
use-python-311.patch Normal file
View File

@@ -0,0 +1,20 @@
--- resource-agents-4.16.0+git38.da9ef4e2/configure.ac.orig 2025-01-28 18:29:13.312397138 +0100
+++ resource-agents-4.16.0+git38.da9ef4e2/configure.ac 2025-01-28 18:29:53.144814319 +0100
@@ -503,7 +503,7 @@
AC_SUBST(RM)
AC_SUBST(TEST)
-AM_PATH_PYTHON([3.6])
+AM_PATH_PYTHON([3.11])
if test -z "$PYTHON"; then
echo "*** Essential program python not found" 1>&2
exit 1
@@ -523,7 +523,7 @@
AC_PYTHON_MODULE(urllib3)
AC_PYTHON_MODULE(ibm_cloud_fail_over)
-AS_VERSION_COMPARE([$PYTHON_VERSION], [3.6], [BUILD_OCF_PY=0], [BUILD_OCF_PY=1], [BUILD_OCF_PY=1])
+AS_VERSION_COMPARE([$PYTHON_VERSION], [3.11], [BUILD_OCF_PY=0], [BUILD_OCF_PY=1], [BUILD_OCF_PY=1])
BUILD_AZURE_EVENTS=1
if test -z "$PYTHON" || test $BUILD_OCF_PY -eq 0; then