From 107896448cc6643ca2d6186aedabc2fb3e0a937c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 07 2021 04:12:30 +0000 Subject: import fence-agents-4.2.1-70.el8 --- diff --git a/SOURCES/bz1942363-fence_gce-default-to-cycle.patch b/SOURCES/bz1942363-fence_gce-default-to-cycle.patch new file mode 100644 index 0000000..3034deb --- /dev/null +++ b/SOURCES/bz1942363-fence_gce-default-to-cycle.patch @@ -0,0 +1,37 @@ +From b8793b7cdacf0eb13e86581fcba1f78bb7a4bc13 Mon Sep 17 00:00:00 2001 +From: Tim Megela +Date: Thu, 11 Mar 2021 06:41:59 -0500 +Subject: [PATCH] Default method moved back to powercycle + +Moving back to powercycle as the default method for GCE. This is the recommended approach from Google. Using on/off as the default will have unintended consequences on google cloud platforms. +--- + agents/gce/fence_gce.py | 2 ++ + tests/data/metadata/fence_gce.xml | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/agents/gce/fence_gce.py b/agents/gce/fence_gce.py +index 1784e1b70..d59ce2bad 100644 +--- a/agents/gce/fence_gce.py ++++ b/agents/gce/fence_gce.py +@@ -358,6 +358,8 @@ 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 f09c771f3..bb5137878 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 c355db6..486a309 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: 69%{?alphatag:.%{alphatag}}%{?dist} +Release: 70%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -127,6 +127,7 @@ Patch85: bz1920947-fence_redfish-add-diag-action.patch Patch86: bz1941989-fence_aws-add-filter-parameter.patch Patch87: bz1780825-fencing-1-add-stonith_status_sleep.patch Patch88: bz1780825-fencing-2-metadata-fix-long-parameters.patch +Patch89: bz1942363-fence_gce-default-to-cycle.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 @@ -293,6 +294,7 @@ BuildRequires: python3-google-api-client %patch86 -p1 -F1 %patch87 -p1 %patch88 -p1 +%patch89 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1183,6 +1185,10 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Thu May 6 2021 Oyvind Albrigtsen - 4.2.1-70 +- fence_gce: change default back to cycle to avoid "soft" off + Resolves: rhbz#1942363 + * Tue May 4 2021 Oyvind Albrigtsen - 4.2.1-69 - fencing: add "stonith_status_sleep" parameter to set sleep between status calls during STONITH action