Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 1aec9ebbf9 |
33
2075.patch
Normal file
33
2075.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
From ef5552acb8177dc97af6722d2be2041248e1d475 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Varkoly <varkoly@suse.com>
|
||||
Date: Mon, 22 Sep 2025 15:36:07 +0200
|
||||
Subject: [PATCH] Enhance documentation: setproctitle_enable and background
|
||||
must be set correctly. Use -f for pgrep to find the right pid.
|
||||
|
||||
---
|
||||
heartbeat/vsftpd.in | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/vsftpd.in b/heartbeat/vsftpd.in
|
||||
index 3831c4fa82..e62171f554 100644
|
||||
--- a/heartbeat/vsftpd.in
|
||||
+++ b/heartbeat/vsftpd.in
|
||||
@@ -53,7 +53,8 @@ cat <<END
|
||||
<resource-agent name="vsftpd" version="1.0">
|
||||
<version>1.0</version>
|
||||
<longdesc lang="en">
|
||||
-This script manages vsftpd
|
||||
+This script manages vsftpd.
|
||||
+The parameter background in the vsftpd.conf must be set to yes and setproctitle_enable must be disabled. Otherwise the RA can not work.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Manages an vsftpd</shortdesc>
|
||||
|
||||
@@ -155,7 +156,7 @@ vsftpd_start()
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
- PID=$( pgrep $OCF_RESKEY_binpath )
|
||||
+ PID=$( pgrep -f $OCF_RESKEY_binpath )
|
||||
case $? in
|
||||
0)
|
||||
ocf_log info "PID file (pid:${PID} at $PIDFILE) created for vsftpd."
|
||||
@@ -1,6 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/ClusterLabs/resource-agents.git</param>
|
||||
<param name="changesrevision">b33c378db3a04709a276a436606105e52a946116</param>
|
||||
<param name="changesrevision">968ad70124518348f8115fc414cf48bd1193e538</param>
|
||||
</service>
|
||||
</servicedata>
|
||||
BIN
resource-agents-4.16.0+git90.968ad701.tar.xz
LFS
Normal file
BIN
resource-agents-4.16.0+git90.968ad701.tar.xz
LFS
Normal file
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cdd8adedc1ece568dc41d3fd34853c9f79f856fa2dfbe8763a6c34724d3f2aec
|
||||
size 661708
|
||||
@@ -1,85 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 26 14:30:47 UTC 2026 - Peter Varkoly <varkoly@suse.com>
|
||||
Wed Sep 24 08:33:56 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
- Update to version 4.17.0+git30.b33c378d: (jsc#PED-15014)
|
||||
* powervs-move-ip/powervs-subnet: fix error logging
|
||||
* Filesystem: optionally report "xargs ps -f" even when killing many processes
|
||||
* ocf-shellfunc: add ocf_log_pipe
|
||||
* findif.c: remove unused colonptr variable
|
||||
* Filesystem: use -eq/-ne for numeric variables
|
||||
* powervs-subnet: wait until IP is activated before running monitor-check
|
||||
* OCPBUGS-64765: podman-etcd: add -a option to crictl ps (#2112)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 22 11:58:06 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
- (jsc#PED-14860) Fix packages for Immutable Mode - resource-agents
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 17:47:09 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
- Update to version 4.17.0+git18.92719d83:
|
||||
* Filesystem: signal many processes in parallel
|
||||
* podman-etcd: sync environment variables with Pod manifest
|
||||
* OCPEDGE-2231: podman-etcd: improve error handling to support retry on start errors (#2105)
|
||||
* Filesystem: new force_unmount=move option
|
||||
* Filesystem: try umount immediately after signals are sent
|
||||
* Filesystem: tmpfs/overlayfs have no need for systemd_drop_in
|
||||
* Filesystem: improve shell trace (set -x) output
|
||||
* OCPEDGE-2213: podman-etcd: fix to prevent learner from starting before cluster is ready (#2098)
|
||||
* exportfs: fix grep error on stop
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 25 13:22:46 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
- Update to version 4.17.0+git5.e3a22113:
|
||||
* podman-etcd: remove test code (#2103)
|
||||
* ocft: fix failing tests in resource-agents v4.17.0
|
||||
* OCPBUGS-60098: podman-etcd: prevent last active member from leaving the etcd member list
|
||||
* build: update ChangeLog for 4.17.0
|
||||
* nginx: restore SELinux context for pid-file during validate-all
|
||||
* build: update ChangeLog for 4.17.0-rc1
|
||||
* storage_mon.c: fix block-seek mask deriving it from the block-size
|
||||
* storage_mon.c: refactor moving up getting blocksize
|
||||
* storage_mon: refactor removing basically duplicate code
|
||||
* podman-etcd: fix count of fnc holders in container_health_check
|
||||
* nginx: fix ls-redirection, mute non-errors in validate-all, and set unique intervals for monitor actions
|
||||
* powervs-move-ip: add optional iflabel argument, increase maximum number of retries for requests (#2092)
|
||||
* nfsserver: set systemd_running before nfsserver_validate() to avoid error message
|
||||
* oracle: improve monpassword description
|
||||
* MailTo: add s-nail support for multiple recipients
|
||||
* Update truly active resources count with safer empty calculation
|
||||
* podman-etcd: add container crash detection with coordinated recovery
|
||||
* db2: fix monitor_retries_sleep variable name
|
||||
* Filesystem: speed up get pids (#2084)
|
||||
* podman-etcd: compute dynamic revision bump from maxRaftIndex (#2087)
|
||||
* OCPEDGE-1502: feat: podman-etcd: add support for cert rotation (#2085)
|
||||
* portblock: add Promoted monitor op, validate-all checks, and add "method" and "status_check" parameters
|
||||
* db2: use reintegration flag to avoid race condition on cluster reintegration, and removed FAL, as it's no longer needed
|
||||
* Redo counting of active_resources
|
||||
* spec: make nfs-utils a weak dependency
|
||||
* OCPBUGS-42808: podman-etcd: add automatic learner member promotion (#2078)
|
||||
* portblock: fix incorrect promotable description
|
||||
* nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs" in /etc/nfs.conf to avoid issues with non-clustered Kerberized mounts
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 05 09:30:34 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
- Update to version 4.16.0+git104.b9d8ef2b:
|
||||
* Enhance documentation: setproctitle_enable and background must be set correctly. (#2075) (bsc#1249819)
|
||||
* podman-etcd: Add cluster-wide force_new_cluster attribute checking
|
||||
* powervs-move-ip: new resource agent (#2072)
|
||||
* portblock: add nftables and multi-state support
|
||||
* podman-etcd: preserve containers for debugging
|
||||
* OCPBUGS-60977: podman-etcd: wrap ipv6 address in brackets for attribute_node_ip (#2068)
|
||||
* db2: add "monitor_retries", "monitor_sleep", and "monitor_retry_all_errors" parameters to be able to avoid failing on first try
|
||||
* db2: add "skip_basic_sql_health_check" parameter to avoid failing on systems with high load
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 04 08:05:12 UTC 2025 - varkoly@suse.com
|
||||
|
||||
- Update to version 4.16.0+git92.52e588f2:
|
||||
* Fix shellcheck errors on output redirection [SC2328]
|
||||
- L3: OCF Resource Agents for vsftpd failure: No PID found (bsc#1249819)
|
||||
Add patch:
|
||||
2075.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 24 07:38:20 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package resource-agents
|
||||
#
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
# 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,7 +17,7 @@
|
||||
|
||||
|
||||
Name: resource-agents
|
||||
Version: 4.17.0+git30.b33c378d
|
||||
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
|
||||
@@ -32,16 +32,17 @@ 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
|
||||
# PATCH-FIX-OPENSUSE: Remove deprecated perl-IO-Socket-INET6 dependency
|
||||
Patch5: resource-agents-deprecate-INET6.patch
|
||||
## PATCH-FIX-OPENSUSE:
|
||||
%if "%{python_flavor}" == "python311"
|
||||
Patch7: use-python-311.patch
|
||||
%endif
|
||||
Patch8: nfsnotify.patch
|
||||
Patch9: portblock.patch
|
||||
Patch10: bsc-1241692.patch
|
||||
Patch11: 2075.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}
|
||||
@@ -113,6 +114,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
%if "%{python_flavor}" == "python311"
|
||||
%patch -P 7 -p1
|
||||
%endif
|
||||
@@ -216,6 +218,7 @@ ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip
|
||||
%{_sbindir}/ocf-tester
|
||||
%{_sbindir}/ocft
|
||||
%{_includedir}/heartbeat
|
||||
%ghost %dir %attr (1755, root, root) %{_rundir}/resource-agents
|
||||
%doc AUTHORS
|
||||
%license COPYING
|
||||
%license COPYING.LGPL
|
||||
|
||||
Reference in New Issue
Block a user