From 568c0a865c471339bb075723315caee13e38da63 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 11 2022 16:58:22 +0000 Subject: import fence-agents-4.10.0-13.el9 --- diff --git a/SOURCES/bz2010709-1-fence_amt_ws-fix-or-causing-dead-code.patch b/SOURCES/bz2010709-1-fence_amt_ws-fix-or-causing-dead-code.patch new file mode 100644 index 0000000..bdbeab0 --- /dev/null +++ b/SOURCES/bz2010709-1-fence_amt_ws-fix-or-causing-dead-code.patch @@ -0,0 +1,22 @@ +From 06855a8227fa91f6216119daa3d32d5858c62837 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Mon, 27 Sep 2021 12:05:41 +0200 +Subject: [PATCH] fence_amt_ws: fix "or" causing dead code + +--- + agents/amt_ws/fence_amt_ws.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/amt_ws/fence_amt_ws.py b/agents/amt_ws/fence_amt_ws.py +index 23c8a61a4..122cec309 100755 +--- a/agents/amt_ws/fence_amt_ws.py ++++ b/agents/amt_ws/fence_amt_ws.py +@@ -148,7 +148,7 @@ def set_boot_order(_, client, options): + + if options["--boot-option"] == "pxe": + device = "Intel(r) AMT: Force PXE Boot" +- elif options["--boot-option"] == "hd" or "hdsafe": ++ elif options["--boot-option"] in ["hd", "hdsafe"]: + device = "Intel(r) AMT: Force Hard-drive Boot" + elif options["--boot-option"] == "cd": + device = "Intel(r) AMT: Force CD/DVD Boot" diff --git a/SOURCES/bz2010709-2-fence_amt_ws-boot-option.patch b/SOURCES/bz2010709-2-fence_amt_ws-boot-option.patch new file mode 100644 index 0000000..dd37fef --- /dev/null +++ b/SOURCES/bz2010709-2-fence_amt_ws-boot-option.patch @@ -0,0 +1,32 @@ +From 9812473270e9a404c632358c1debfa4a1fb440fe Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 20 Oct 2021 15:46:42 +0200 +Subject: [PATCH] fence_amt_ws: fix --boot-option (choices are uppercased while + getting parsed) + +--- + agents/amt_ws/fence_amt_ws.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/agents/amt_ws/fence_amt_ws.py b/agents/amt_ws/fence_amt_ws.py +index 122cec309..5e7452a97 100755 +--- a/agents/amt_ws/fence_amt_ws.py ++++ b/agents/amt_ws/fence_amt_ws.py +@@ -146,13 +146,13 @@ def set_boot_order(_, client, options): + wsman = 'http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd' + namespace = CIM_BootConfigSetting + +- if options["--boot-option"] == "pxe": ++ if options["--boot-option"] == "PXE": + device = "Intel(r) AMT: Force PXE Boot" +- elif options["--boot-option"] in ["hd", "hdsafe"]: ++ elif options["--boot-option"] in ["HD", "HDSAFE"]: + device = "Intel(r) AMT: Force Hard-drive Boot" +- elif options["--boot-option"] == "cd": ++ elif options["--boot-option"] == "CD": + device = "Intel(r) AMT: Force CD/DVD Boot" +- elif options["--boot-option"] == "diag": ++ elif options["--boot-option"] == "DIAG": + device = "Intel(r) AMT: Force Diagnostic Boot" + else: + logging.error('Boot device: %s not supported.', \ diff --git a/SOURCES/bz2010709-fence_amt_ws-fix-or-causing-dead-code.patch b/SOURCES/bz2010709-fence_amt_ws-fix-or-causing-dead-code.patch deleted file mode 100644 index bdbeab0..0000000 --- a/SOURCES/bz2010709-fence_amt_ws-fix-or-causing-dead-code.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 06855a8227fa91f6216119daa3d32d5858c62837 Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Mon, 27 Sep 2021 12:05:41 +0200 -Subject: [PATCH] fence_amt_ws: fix "or" causing dead code - ---- - agents/amt_ws/fence_amt_ws.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/agents/amt_ws/fence_amt_ws.py b/agents/amt_ws/fence_amt_ws.py -index 23c8a61a4..122cec309 100755 ---- a/agents/amt_ws/fence_amt_ws.py -+++ b/agents/amt_ws/fence_amt_ws.py -@@ -148,7 +148,7 @@ def set_boot_order(_, client, options): - - if options["--boot-option"] == "pxe": - device = "Intel(r) AMT: Force PXE Boot" -- elif options["--boot-option"] == "hd" or "hdsafe": -+ elif options["--boot-option"] in ["hd", "hdsafe"]: - device = "Intel(r) AMT: Force Hard-drive Boot" - elif options["--boot-option"] == "cd": - device = "Intel(r) AMT: Force CD/DVD Boot" diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index b721013..e488765 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -59,7 +59,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 12%{?alphatag:.%{alphatag}}%{?dist} +Release: 13%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -221,10 +221,11 @@ Patch4: ha-openstack-support.patch Patch5: bundled-pexpect.patch Patch6: bundled-suds.patch Patch7: bz2010652-fence_azure_arm-fix-sovereign-cloud-msi-support.patch -Patch8: bz2010709-fence_amt_ws-fix-or-causing-dead-code.patch -Patch9: bz2000954-1-configure-fix-virt.patch -Patch10: bz2000954-2-fence_kubevirt.patch -Patch11: bz2022334-fence_zvmip-add-ssl-tls-support.patch +Patch8: bz2010709-1-fence_amt_ws-fix-or-causing-dead-code.patch +Patch9: bz2010709-2-fence_amt_ws-boot-option.patch +Patch10: bz2000954-1-configure-fix-virt.patch +Patch11: bz2000954-2-fence_kubevirt.patch +Patch12: bz2022334-fence_zvmip-add-ssl-tls-support.patch %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 kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti %ifarch x86_64 @@ -1403,6 +1404,10 @@ are located on corosync cluster nodes. %endif %changelog +* Thu Dec 2 2021 Oyvind Albrigtsen - 4.10.0-13 +- fence_amt_ws: fix "or" causing dead code + Resolves: rhbz#2010709 + * Thu Nov 11 2021 Oyvind Albrigtsen - 4.10.0-12 - fence_zvmip: add SSL/TLS support Resolves: rhbz#2022334 @@ -1414,8 +1419,6 @@ are located on corosync cluster nodes. * Tue Oct 5 2021 Oyvind Albrigtsen - 4.10.0-10 - fence_azure_arm: fix sovereign cloud and MSI support Resolves: rhbz#2010652 -- fence_amt_ws: fix "or" causing dead code - Resolves: rhbz#2010709 * Tue Aug 31 2021 Oyvind Albrigtsen - 4.10.0-9 - Only build fence-virt subpackages for x86_64 arch