From 4a73456e01b8375eebb75d2e77ca9305b70c81dd Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 15 Sep 2025 15:41:05 +0200 Subject: [PATCH] - fence_ibm_powervs: update description of api-type parameter to show correct default value Resolves: RHEL-114753 --- ..._powervs-update-api-type-description.patch | 68 +++++++++++++++++++ fence-agents.spec | 9 ++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 RHEL-114753-fence_ibm_powervs-update-api-type-description.patch diff --git a/RHEL-114753-fence_ibm_powervs-update-api-type-description.patch b/RHEL-114753-fence_ibm_powervs-update-api-type-description.patch new file mode 100644 index 0000000..9d402ab --- /dev/null +++ b/RHEL-114753-fence_ibm_powervs-update-api-type-description.patch @@ -0,0 +1,68 @@ +From 604b4aa99a644c11f94f22562370fafc98d6bfbb Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +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 @@ + https://www.ibm.com + + +- +- +- API-type (public|private) ++ ++ ++ ++ API-type (private|public) + + +- +- +- API-type (public|private) ++ ++ ++ ++ API-type (private|public) + + + diff --git a/fence-agents.spec b/fence-agents.spec index 73d72dc..3c7529b 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: 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 - 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 - 4.10.0-98 - fence_aws: add "skip_os_shutdown" parameter to allow hard poweroff Resolves: RHEL-7601