diff --git a/bz1650214-fence_azure_arm-bundled.patch b/bz1650214-fence_azure_arm-bundled.patch deleted file mode 100644 index 747c15127705daa9e2b9b9d69c298293a491d4e9..0000000000000000000000000000000000000000 --- a/bz1650214-fence_azure_arm-bundled.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence_azure_arm.py ---- a/agents/azure_arm/fence_azure_arm.py 2018-06-28 14:24:54.000000000 +0200 -+++ b/agents/azure_arm/fence_azure_arm.py 2019-01-15 10:24:16.030092206 +0100 -@@ -7,6 +7,8 @@ - sys.path.append("@FENCEAGENTSLIBDIR@") - from fencing import * - from fencing import fail_usage, run_command, run_delay -+ -+sys.path.insert(0, '/usr/lib/fence-agents/bundled/azure') - import azure_fence - - def get_nodes_list(clients, options): diff --git a/bz1700546-fence_azure_arm-skip_shutdown.patch b/bz1700546-fence_azure_arm-skip_shutdown.patch deleted file mode 100644 index 708eb84bc4aa20fa2154d3079c211cd35006d374..0000000000000000000000000000000000000000 --- a/bz1700546-fence_azure_arm-skip_shutdown.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1b3e548fcc0bd427dade178fa260567047ff3a0e Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Mon, 6 May 2019 13:24:18 +0200 -Subject: [PATCH] fence_azure_arm: use skip_shutdown feature when available - -The "skip_shutdown" parameter is ignored in older Azure SDK, so there's -no need for a fallback option. ---- - agents/azure_arm/fence_azure_arm.py | 6 +++--- - tests/data/metadata/fence_azure_arm.xml | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence_azure_arm.py -index 58b9eeb13..be0d40345 100755 ---- a/agents/azure_arm/fence_azure_arm.py -+++ b/agents/azure_arm/fence_azure_arm.py -@@ -114,8 +114,8 @@ def set_power_status(clients, options): - azure_fence.set_network_state(compute_client, network_client, rgName, vmName, "unblock") - - if (options["--action"]=="off"): -- logging.info("Deallocating " + vmName + " in resource group " + rgName) -- compute_client.virtual_machines.deallocate(rgName, vmName) -+ logging.info("Poweroff " + vmName + " in resource group " + rgName) -+ compute_client.virtual_machines.power_off(rgName, vmName, skip_shutdown=True) - elif (options["--action"]=="on"): - logging.info("Starting " + vmName + " in resource group " + rgName) - compute_client.virtual_machines.start(rgName, vmName) -@@ -199,7 +199,7 @@ def main(): - - docs = {} - docs["shortdesc"] = "Fence agent for Azure Resource Manager" -- docs["longdesc"] = "Used to deallocate virtual machines and to report power state of virtual machines running in Azure. It uses Azure SDK for Python to connect to Azure.\ -+ docs["longdesc"] = "fence_azure_arm is an I/O Fencing agent for Azure Resource Manager. It uses Azure SDK for Python to connect to Azure.\ - \n.P\n\ - For instructions to setup credentials see: https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal\ - \n.P\n\ -diff --git a/tests/data/metadata/fence_azure_arm.xml b/tests/data/metadata/fence_azure_arm.xml -index 1c0b6cc6b..97ecfdba4 100644 ---- a/tests/data/metadata/fence_azure_arm.xml -+++ b/tests/data/metadata/fence_azure_arm.xml -@@ -1,6 +1,6 @@ - - --Used to deallocate virtual machines and to report power state of virtual machines running in Azure. It uses Azure SDK for Python to connect to Azure. -+fence_azure_arm is an I/O Fencing agent for Azure Resource Manager. It uses Azure SDK for Python to connect to Azure. - - For instructions to setup credentials see: https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal - diff --git a/fence-agents.spec b/fence-agents.spec index 796addb1fb01bf070dfa7529d888e15b30c625bc..da2060ccc50651558b9a20657124e19b3c2c4bcb 100644 --- a/fence-agents.spec +++ b/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: 31 +Release: 32 License: GPLv2+ and LGPLv2+ and ASL 2.0 and BSD and MIT and Python-2.0 and Artistic-1.0-Perl Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -61,7 +61,6 @@ Patch19: bz1654976-1-fence_scsi-watchdog-retry-support.patch Patch20: bz1654976-2-build-fix-check_used_options.patch Patch21: bz1654616-fence_hpblade-fix-log_expect_syntax.patch Patch22: bz1654973-fence_vmware_soap-cleanup-sigterm.patch -Patch23: bz1650214-fence_azure_arm-bundled.patch Patch24: bz1666914-1-fence_redfish.patch Patch25: bz1666914-2-fence_redfish-fail-invalid-cert.patch Patch26: bz1677327-1-fence_redfish-use-ipport-parameter.patch @@ -71,7 +70,6 @@ Patch29: bz1709926-fence_mpath-fix-watchdog-hardreboot.patch Patch30: bz1709780-fence_rhevm-RHEV-v4-API-support.patch Patch31: bz1712263-fence_rhevm-1-use-UTF8-encoding.patch Patch32: bz1712263-fence_rhevm-2-fix-debug-encoding-issues.patch -Patch33: bz1700546-fence_azure_arm-skip_shutdown.patch Patch34: bz1704228-fence_redfish-full-redfish-spec-compliance.patch Patch35: bz1714458-fence_scsi-node-id-new-format.patch Patch36: bz1720198-fence_scsi-watchdog-fix-retry-failing-on-first-try.patch @@ -82,7 +80,7 @@ Patch39: bz1762432-fence_compute-disable-service-after-force-down.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 hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan mpath kdump redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti %ifarch x86_64 -%global testagents virsh heuristics_ping aliyun aws azure_arm gce +%global testagents virsh heuristics_ping aliyun aws gce %endif %ifarch ppc64le %global testagents virsh lpar heuristics_ping @@ -178,7 +176,6 @@ BuildRequires: python3-google-api-client %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 %patch24 -p1 %patch25 -p1 %patch26 -p1 @@ -188,7 +185,6 @@ BuildRequires: python3-google-api-client %patch30 -p1 -F2 %patch31 -p1 -F2 %patch32 -p1 -%patch33 -p1 %patch34 -p1 %patch35 -p1 %patch36 -p1 -F1 @@ -227,7 +223,7 @@ cp %{aliyunsdkvpc_dir}/README.rst %{aliyunsdkvpc}_README.rst %build ./autogen.sh -%{configure} PYTHON="%{__python3}" --with-agents='amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan mpath kdump redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti virsh heuristics_ping aliyun aws azure_arm gce' +%{configure} PYTHON="%{__python3}" --with-agents='amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan mpath kdump redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti virsh heuristics_ping aliyun aws gce' CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags} %ifarch x86_64 @@ -310,8 +306,6 @@ This package contains support files including the Python fencing library. %files common %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence %{_datadir}/fence -%exclude %{_datadir}/fence/azure_fence.* -%exclude %{_datadir}/fence/__pycache__/azure_fence.* %exclude %{_datadir}/fence/XenAPI.* %exclude %{_datadir}/fence/__pycache__/XenAPI.* %{_datadir}/cluster @@ -462,24 +456,6 @@ Fence agent for Amazon AWS instances. %{_mandir}/man8/fence_aws.8* %endif -%ifarch x86_64 -%package azure-arm -License: GPLv2+ and LGPLv2+ -Group: System Environment/Base -Summary: Fence agent for Azure Resource Manager -Requires: fence-agents-common >= %{version}-%{release} -Requires: python3-azure-sdk >= 4.0.0-9 -BuildArch: noarch -Obsoletes: fence-agents -%description azure-arm -Fence agent for Azure Resource Manager instances. -%files azure-arm -%{_sbindir}/fence_azure_arm -%{_datadir}/fence/azure_fence.py* -%{_datadir}/fence/__pycache__/azure_fence.* -%{_mandir}/man8/fence_azure_arm.8* -%endif - %package bladecenter License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -987,8 +963,11 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Fri Jan 29 2021 jiangxinyu - 4.2.1-32 +- Remove the azure plug-in + * Fri Oct 30 2020 liqiuyu - 4.2.1-31 - Resolve agent redfish compilation fail * Thu Apr 16 2020 houjian - 4.2.1-30.1 -- Init fence-agents project \ No newline at end of file +- Init fence-agents project