diff --git a/bz2136076-fence_ibm_powervs-improve-defaults.patch b/bz2136076-fence_ibm_powervs-improve-defaults.patch new file mode 100644 index 0000000..7f5e578 --- /dev/null +++ b/bz2136076-fence_ibm_powervs-improve-defaults.patch @@ -0,0 +1,46 @@ +From 3373431dc49d6e429bbf613765385cb33a56e917 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 25 Oct 2022 10:39:29 +0200 +Subject: [PATCH] fence_ibm_powervs: improve defaults based on testing + +--- + agents/ibm_powervs/fence_ibm_powervs.py | 4 ++-- + tests/data/metadata/fence_ibm_powervs.xml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/agents/ibm_powervs/fence_ibm_powervs.py b/agents/ibm_powervs/fence_ibm_powervs.py +index b0caed7c5..183893616 100755 +--- a/agents/ibm_powervs/fence_ibm_powervs.py ++++ b/agents/ibm_powervs/fence_ibm_powervs.py +@@ -232,10 +232,10 @@ def main(): + atexit.register(atexit_handler) + define_new_opts() + +- all_opt["shell_timeout"]["default"] = "15" ++ all_opt["shell_timeout"]["default"] = "500" + all_opt["power_timeout"]["default"] = "30" + all_opt["power_wait"]["default"] = "1" +- all_opt["stonith_status_sleep"]["default"] = "3" ++ all_opt["stonith_status_sleep"]["default"] = "2" + all_opt["api-type"]["default"] = "private" + all_opt["proxy"]["default"] = "" + +diff --git a/tests/data/metadata/fence_ibm_powervs.xml b/tests/data/metadata/fence_ibm_powervs.xml +index 40c494110..326bc2378 100644 +--- a/tests/data/metadata/fence_ibm_powervs.xml ++++ b/tests/data/metadata/fence_ibm_powervs.xml +@@ -119,12 +119,12 @@ + + + +- ++ + Wait X seconds for cmd prompt after issuing command + + + +- ++ + Sleep X seconds between status calls during a STONITH action + + diff --git a/fence-agents.spec b/fence-agents.spec index 5ab8434..b41eb59 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -87,7 +87,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.2.1 -Release: 107%{?alphatag:.%{alphatag}}%{?dist} +Release: 108%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -262,6 +262,7 @@ Patch119: bz1886074-4-fencing-source_env-dont-process-empty-lines.patch Patch120: bz1787178-fence_vmware_soap-set-timeout-cleanup-tmp-dirs.patch Patch121: bz2102024-fence_ibm_vpc-add-token-cache-support.patch Patch122: bz2134017-fence_lpar-only-output-additional-info-on-debug.patch +Patch123: bz2136076-fence_ibm_powervs-improve-defaults.patch %if 0%{?fedora} || 0%{?rhel} > 7 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hds_cb hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti @@ -462,6 +463,7 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja %patch120 -p1 %patch121 -p1 -F2 %patch122 -p1 +%patch123 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1459,6 +1461,10 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Thu Oct 27 2022 Oyvind Albrigtsen - 4.2.1-108 +- fence_ibm_powervs: improve defaults + Resolves: rhbz#2136076 + * Wed Oct 12 2022 Oyvind Albrigtsen - 4.2.1-107 - fence_lpar: only output additional output info on DEBUG level Resolves: rhbz#2134017