From 13197d6073eb0b890a56a18ac0c3bfc6c4549a40 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 5 Aug 2025 09:42:22 +0200 Subject: [PATCH] - Revert "- fence_kubevirt: use hard poweroff" Reverts: RHEL-96179 --- RHEL-96179-fence_kubevirt-force-off.patch | 23 ----------------------- fence-agents.spec | 12 +++--------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 RHEL-96179-fence_kubevirt-force-off.patch diff --git a/RHEL-96179-fence_kubevirt-force-off.patch b/RHEL-96179-fence_kubevirt-force-off.patch deleted file mode 100644 index ac2e281..0000000 --- a/RHEL-96179-fence_kubevirt-force-off.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b6e05c57a73e5d9bdde7d133ba7ec43737a7c6b7 Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Tue, 25 Feb 2025 16:11:32 +0100 -Subject: [PATCH] fence_kubevirt: set grace_period_seconds=0 to immediately - power off the node - ---- - agents/kubevirt/fence_kubevirt.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/agents/kubevirt/fence_kubevirt.py b/agents/kubevirt/fence_kubevirt.py -index e3817b0fb..8ba8ce8db 100755 ---- a/agents/kubevirt/fence_kubevirt.py -+++ b/agents/kubevirt/fence_kubevirt.py -@@ -108,7 +108,7 @@ def define_new_opts(): - def virtctl_vm_action(conn, action, namespace, name, apiversion): - path = '/apis/subresources.{api_version}/namespaces/{namespace}/virtualmachines/{name}/{action}' - path = path.format(api_version=apiversion, namespace=namespace, name=name, action=action) -- return conn.request('put', path, header_params={'accept': '*/*'}) -+ return conn.request('put', path, header_params={'accept': '*/*'}, body={'gracePeriod': 0} if action == 'stop' else None) - - # Main agent method - def main(): diff --git a/fence-agents.spec b/fence-agents.spec index 8d9eaab..569632e 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: 129%{?alphatag:.%{alphatag}}%{?dist}.10 +Release: 129%{?alphatag:.%{alphatag}}%{?dist}.11 License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -316,8 +316,7 @@ Patch143: RHEL-7734-fence_eps-add-fence_epsr2-for-ePowerSwitch-R2-and-newer.patc Patch144: RHEL-56840-fence_scsi-only-preempt-once-for-mpath-devices.patch Patch145: RHEL-76492-fence_azure_arm-use-azure-identity.patch Patch146: RHEL-65025-fence_ibm_powervs-add-private-endpoint-and-token-file-support.patch -Patch147: RHEL-96179-fence_kubevirt-force-off.patch -Patch148: RHEL-99338-fence_aliyun-update.patch +Patch147: RHEL-99338-fence_aliyun-update.patch ### HA support libs/utils ### # all archs @@ -554,7 +553,6 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja %patch -p1 -P 145 %patch -p1 -P 146 %patch -p1 -P 147 -%patch -p1 -P 148 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1601,14 +1599,10 @@ Fence agent for IBM z/VM over IP. %endif %changelog -* Mon Jun 23 2025 Oyvind Albrigtsen - 4.2.1-129.10 +* Tue Aug 5 2025 Oyvind Albrigtsen - 4.2.1-129.11 - fence_aliyun: add credentials file support Resolves: RHEL-99338 -* Fri Jun 13 2025 Oyvind Albrigtsen - 4.2.1-129.9 -- fence_kubevirt: use hard poweroff - Resolves: RHEL-96179 - * Fri Apr 25 2025 Oyvind Albrigtsen - 4.2.1-129.8 - fence_ibm_powervs: add private endpoint and token file support Resolves: RHEL-65025