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

- crypt: new resource agent

Browse Source 
Resolves: RHEL-13089
This commit is contained in:
Oyvind Albrigtsen 2025-04-24 14:52:56 +02:00
parent 2f533e1db3
commit b209cbe076
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
RHEL-13089-crypt-add-tang-clevis-support-and-fix-issues.patch → RHEL-13089-1-crypt-add-tang-clevis-support-and-fix-issues.patch
View File

32
RHEL-13089-2-crypt-fix-crypt_type-check-and-usage.patch Normal file
View File

@ -0,0 +1,32 @@
From fa45156e8b22d477ea8cbbfe48151e4e0b173320 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 24 Apr 2025 14:45:52 +0200
Subject: [PATCH] crypt: fix crypt_type check, and usage when action has not
been specified
---
heartbeat/crypt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/heartbeat/crypt b/heartbeat/crypt
index 4d4d6142b..1dbf8c33f 100755
--- a/heartbeat/crypt
+++ b/heartbeat/crypt
@@ -207,7 +207,7 @@ crypt_validate_all() {
ocf_exit_reason "Hash key file $key_file not accessible"
return $OCF_ERR_CONFIGURED
fi
- if ! ocf_is_true "$use_clevis" && [ ! -r "$crypt_type" ]; then
+ if ! ocf_is_true "$use_clevis" && [ -z "$crypt_type" ]; then
ocf_exit_reason "crypt_type not set"
return $OCF_ERR_CONFIGURED
fi
@@ -348,7 +348,7 @@ crypt_monitor() {
# Check for strange argument count.
if [ $# -ne 1 ]; then
- usage
+ crypt_usage
exit $OCF_ERR_GENERIC
fi

16
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: 13%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 14%{?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
@ -69,7 +69,8 @@ Patch16: RHEL-79822-1-portblock-fix-version-detection.patch
Patch17: RHEL-79822-2-portblock-use-ocf_log-for-logging.patch
Patch18: RHEL-85057-1-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
Patch19: RHEL-85057-2-tomcat-log-validate-all-on-debug-level.patch
Patch20: RHEL-13089-crypt-add-tang-clevis-support-and-fix-issues.patch
Patch20: RHEL-13089-1-crypt-add-tang-clevis-support-and-fix-issues.patch
Patch21: RHEL-13089-2-crypt-fix-crypt_type-check-and-usage.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -249,6 +250,7 @@ exit 1
%patch -p1 -P 18
%patch -p1 -P 19
%patch -p1 -P 20
%patch -p1 -P 21
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -579,11 +581,15 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Tue Apr 22 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-13
- Filesystem: add support for aznfs
* Thu Apr 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-14
- crypt: new resource agent
Resolves: RHEL-88042, RHEL-13089
Resolves: RHEL-13089
* Tue Apr 22 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-13
- Filesystem: add support for aznfs
Resolves: RHEL-88042
* Wed Apr 9 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-12
- tomcat: fix CATALINA_PID not set, and catalina_base and catalina_out