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

- powervs-subnet: fix plaintext token file support

Browse Source 
Resolves: RHEL-235788
This commit is contained in:
Oyvind Albrigtsen 2026-08-17 08:37:58 +02:00
parent ab46b50e34
commit 7997259ed8
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
RHEL-235788-powervs-subnet-fix-plaintext-token-file-support.patch Normal file
View File

@ -0,0 +1,24 @@
From f75a1bb59fe729b9de65fc3c4436e9edaf8f8f41 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 30 Apr 2025 16:09:50 +0200
Subject: [PATCH] powervs-subnet: fix plaintext token file support
---
heartbeat/powervs-subnet.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/heartbeat/powervs-subnet.in b/heartbeat/powervs-subnet.in
index b8f3864e9a..a90bc73c6b 100755
--- a/heartbeat/powervs-subnet.in
+++ b/heartbeat/powervs-subnet.in
@@ -378,8 +378,9 @@ class PowerCloudAPI:
api_key = keys.get("Apikey", "")
if not api_key:
api_key = keys.get("apikey", "")
+ # data is text, return as is
except ValueError:
- # data is text, return as is
+ f.seek(0)
api_key = f.read().strip()
except FileNotFoundError:
raise PowerCloudAPIError(

9
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 129%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 130%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -227,6 +227,7 @@ Patch174: RHEL-183132-portblock-fix-IPv6-rule-detection-in-the-iptables-backend.
Patch175: RHEL-191368-db2-avoid-promoting-in-standby_remote_catchup_pending-state.patch
Patch176: RHEL-224062-1-Route-update-destination-parameter-to-non-unique.patch
Patch177: RHEL-224062-2-Route-update-destination-description-and-add-warning-message.patch
Patch178: RHEL-235788-powervs-subnet-fix-plaintext-token-file-support.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -549,6 +550,7 @@ exit 1
%patch -p1 -P 175
%patch -p1 -P 176
%patch -p1 -P 177
%patch -p1 -P 178
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -883,6 +885,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Mon Aug 17 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-130
- powervs-subnet: fix plaintext token file support
Resolves: RHEL-235788
* Tue Aug 04 2026 Arslan Ahmad <arahmad@redhat.com> - 4.10.0-129
- Route: update 'destination' description and add warning message
when 'default' destination is used