diff --git a/SOURCES/bz1906978-fence_gce-default-to-onoff.patch b/SOURCES/bz1906978-fence_gce-default-to-onoff.patch new file mode 100644 index 0000000..9642832 --- /dev/null +++ b/SOURCES/bz1906978-fence_gce-default-to-onoff.patch @@ -0,0 +1,36 @@ +From 6f1743a7c34b00b0d1602675598ae22a2a3de6b4 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 14 Jan 2021 15:11:14 +0100 +Subject: [PATCH] fence_gce: default to onoff + +--- + agents/gce/fence_gce.py | 2 -- + tests/data/metadata/fence_gce.xml | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/agents/gce/fence_gce.py b/agents/gce/fence_gce.py +index bf5f5693..84cf3634 100644 +--- a/agents/gce/fence_gce.py ++++ b/agents/gce/fence_gce.py +@@ -334,8 +334,6 @@ def main(): + define_new_opts() + + all_opt["power_timeout"]["default"] = "60" +- all_opt["method"]["default"] = "cycle" +- all_opt["method"]["help"] = "-m, --method=[method] Method to fence (onoff|cycle) (Default: cycle)" + + options = check_input(device_opt, process_input(device_opt)) + +diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml +index 33478721..77812ffb 100644 +--- a/tests/data/metadata/fence_gce.xml ++++ b/tests/data/metadata/fence_gce.xml +@@ -12,7 +12,7 @@ For instructions see: https://cloud.google.com/compute/docs/tutorials/python-gui + + + +- ++ + diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index 3dedfba..34dea6a 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -29,7 +29,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.2.1 -Release: 63%{?alphatag:.%{alphatag}}%{?dist} +Release: 64%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -121,6 +121,7 @@ Patch79: bz1470813-fencing-4-make-timeout-0-mean-forever.patch Patch80: bz1841087-fence_scsi-dont-write-key-device-to-file.patch Patch81: bz1896827-fence_aws-add-imdsv2-support.patch Patch82: bz1914313-fence_zvmip-fix-disable-timeout.patch +Patch83: bz1906978-fence_gce-default-to-onoff.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 ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti @@ -281,6 +282,7 @@ BuildRequires: python3-google-api-client %patch80 -p1 %patch81 -p1 %patch82 -p1 +%patch83 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1169,6 +1171,10 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Thu Jan 14 2021 Oyvind Albrigtsen - 4.2.1-64 +- fence_gce: default to onoff + Resolves: rhbz#1906978 + * Mon Jan 11 2021 Oyvind Albrigtsen - 4.2.1-63 - fence_zvmip: fix disable-timeout not working correctly Resolves: rhbz#1914313