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

- fence_ibm_powervs: fix plaintext token file support

Browse Source 
Resolves: RHEL-88568
This commit is contained in:
Oyvind Albrigtsen 2025-04-28 12:08:29 +02:00
parent 9dd21a9db1
commit c84b7c10c0
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
RHEL-88568-fence_ibm_powervs-fix-plaintext-token-file-support.patch Normal file
View File

@ -0,0 +1,21 @@
From 988cbd9fb600261106d5da1db6a7bf9cde218eaa Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Fri, 25 Apr 2025 16:38:03 +0200
Subject: [PATCH] fence_ibm_powervs: fix plaintext token file support
---
agents/ibm_powervs/fence_ibm_powervs.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/agents/ibm_powervs/fence_ibm_powervs.py b/agents/ibm_powervs/fence_ibm_powervs.py
index ec9a0c11d..d408e8727 100755
--- a/agents/ibm_powervs/fence_ibm_powervs.py
+++ b/agents/ibm_powervs/fence_ibm_powervs.py
@@ -35,6 +35,7 @@ def get_token(conn, options):
api_key = keys.get("apikey", "")
# data is text, return as is
except ValueError:
+ f.seek(0)
api_key = f.read().strip()
except FileNotFoundError:
logging.debug("Failed: Cannot open file {}".format(key_file))

8
fence-agents.spec
View File

@ -57,7 +57,7 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.10.0
Release: 90%{?alphatag:.%{alphatag}}%{?dist}
Release: 91%{?alphatag:.%{alphatag}}%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/fence-agents
Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@ -250,6 +250,7 @@ Patch64: RHEL-84448-fence_compute-fence_evacuate-dont-use-deprecated-getargspec.
Patch65: RHEL-79798-fence_sbd-get-devices-from-SBD_DEVICE-if-devices-parameter-isnt-set.patch
Patch66: RHEL-68321-1-fence_nutanix_ahv.patch
Patch67: RHEL-68321-2-fence_nutanix_ahv-update-metadata.patch
Patch68: RHEL-88568-fence_ibm_powervs-fix-plaintext-token-file-support.patch
### HA support libs/utils ###
# all archs
@ -438,6 +439,7 @@ BuildRequires: %{systemd_units}
%patch -p1 -P 65
%patch -p1 -P 66
%patch -p1 -P 67
%patch -p1 -P 68
# prevent compilation of something that won't get used anyway
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@ -1557,6 +1559,10 @@ are located on corosync cluster nodes.
%endif
%changelog
* Mon Apr 28 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-91
- fence_ibm_powervs: fix plaintext token file support
Resolves: RHEL-88568
* Wed Apr 23 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-90
- fence_nutanix_ahv: new fence agent
Resolves: RHEL-68321