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

- fence_ibm_powervs: update description of api-type parameter to show

Browse Source 
correct default value
  Resolves: RHEL-114753
This commit is contained in:
Oyvind Albrigtsen 2025-09-15 15:41:05 +02:00
parent 9de768060d
commit 4a73456e01
2 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
RHEL-114753-fence_ibm_powervs-update-api-type-description.patch Normal file
View File

@ -0,0 +1,68 @@
From 604b4aa99a644c11f94f22562370fafc98d6bfbb Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 25 Aug 2025 13:28:59 +0200
Subject: [PATCH] fence_ibm_powervs: update description of api-type parameter
to show correct default value
---
agents/ibm_powervs/fence_ibm_powervs.py | 7 ++++---
tests/data/metadata/fence_ibm_powervs.xml | 18 ++++++++++++------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/agents/ibm_powervs/fence_ibm_powervs.py b/agents/ibm_powervs/fence_ibm_powervs.py
index d408e8727..aa7d66b57 100755
--- a/agents/ibm_powervs/fence_ibm_powervs.py
+++ b/agents/ibm_powervs/fence_ibm_powervs.py
@@ -258,9 +258,11 @@ def define_new_opts():
all_opt["api-type"] = {
"getopt" : ":",
"longopt" : "api-type",
- "help" : "--api-type=[public|private] API-type: 'public' (default) or 'private'",
+ "help" : "--api-type=[private|public] API-type: 'private' (default) or 'public'",
"required" : "0",
- "shortdesc" : "API-type (public|private)",
+ "shortdesc" : "API-type (private|public)",
+ "choices" : ["private", "public"],
+ "default" : "private",
"order" : 0
}
all_opt["proxy"] = {
@@ -293,7 +295,6 @@ def main():
all_opt["power_timeout"]["default"] = "120"
all_opt["power_wait"]["default"] = "15"
all_opt["stonith_status_sleep"]["default"] = "10"
- all_opt["api-type"]["default"] = "private"
all_opt["proxy"]["default"] = ""
options = check_input(device_opt, process_input(device_opt))
diff --git a/tests/data/metadata/fence_ibm_powervs.xml b/tests/data/metadata/fence_ibm_powervs.xml
index ec59e1b53..62f5c34ff 100644
--- a/tests/data/metadata/fence_ibm_powervs.xml
+++ b/tests/data/metadata/fence_ibm_powervs.xml
@@ -4,14 +4,20 @@
<vendor-url>https://www.ibm.com</vendor-url>
<parameters>
<parameter name="api-type" unique="0" required="0" deprecated="1">
- <getopt mixed="--api-type=[public|private]" />
- <content type="string" default="private" />
- <shortdesc lang="en">API-type (public|private)</shortdesc>
+ <getopt mixed="--api-type=[private|public]" />
+ <content type="select" default="private" >
+ <option value="private" />
+ <option value="public" />
+ </content>
+ <shortdesc lang="en">API-type (private|public)</shortdesc>
</parameter>
<parameter name="api_type" unique="0" required="0" obsoletes="api-type">
- <getopt mixed="--api-type=[public|private]" />
- <content type="string" default="private" />
- <shortdesc lang="en">API-type (public|private)</shortdesc>
+ <getopt mixed="--api-type=[private|public]" />
+ <content type="select" default="private" >
+ <option value="private" />
+ <option value="public" />
+ </content>
+ <shortdesc lang="en">API-type (private|public)</shortdesc>
</parameter>
<parameter name="crn" unique="0" required="1">
<getopt mixed="--crn=[crn]" />

9
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: 98%{?alphatag:.%{alphatag}}%{?dist}
Release: 99%{?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
@ -254,6 +254,7 @@ Patch69: RHEL-13088-fence_sbd-improve-error-handling.patch
Patch70: RHEL-82193-fence_kubevirt-force-off.patch
Patch71: RHEL-107505-fence_ibm_vpc-add-apikey-file-support.patch
Patch72: RHEL-7601-fence_aws-add-skipshutdown-parameter.patch
Patch73: RHEL-114753-fence_ibm_powervs-update-api-type-description.patch
### HA support libs/utils ###
# all archs
@ -448,6 +449,7 @@ BuildRequires: %{systemd_units}
%patch -p1 -P 70
%patch -p1 -P 71
%patch -p1 -P 72 -F2
%patch -p1 -P 73
# prevent compilation of something that won't get used anyway
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@ -1568,6 +1570,11 @@ are located on corosync cluster nodes.
%endif
%changelog
* Mon Sep 15 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-99
- fence_ibm_powervs: update description of api-type parameter to show
correct default value
Resolves: RHEL-114753
* Tue Aug 19 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-98
- fence_aws: add "skip_os_shutdown" parameter to allow hard poweroff
Resolves: RHEL-7601