From c84b7c10c022c037e58310458ca0ee662ccd15d0 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 28 Apr 2025 12:08:29 +0200 Subject: [PATCH] - fence_ibm_powervs: fix plaintext token file support Resolves: RHEL-88568 --- ...rvs-fix-plaintext-token-file-support.patch | 21 +++++++++++++++++++ fence-agents.spec | 8 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 RHEL-88568-fence_ibm_powervs-fix-plaintext-token-file-support.patch diff --git a/RHEL-88568-fence_ibm_powervs-fix-plaintext-token-file-support.patch b/RHEL-88568-fence_ibm_powervs-fix-plaintext-token-file-support.patch new file mode 100644 index 0000000..3eeb9c7 --- /dev/null +++ b/RHEL-88568-fence_ibm_powervs-fix-plaintext-token-file-support.patch @@ -0,0 +1,21 @@ +From 988cbd9fb600261106d5da1db6a7bf9cde218eaa Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +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)) diff --git a/fence-agents.spec b/fence-agents.spec index 5741255..0a4ffb8 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -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 - 4.10.0-91 +- fence_ibm_powervs: fix plaintext token file support + Resolves: RHEL-88568 + * Wed Apr 23 2025 Oyvind Albrigtsen - 4.10.0-90 - fence_nutanix_ahv: new fence agent Resolves: RHEL-68321