From face9b9e4f4ba83c46b0028a4484b738839bd710 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 16 2021 02:36:48 +0000 Subject: import fence-agents-4.2.1-67.el8 --- diff --git a/SOURCES/bz1920947-fence_redfish-add-diag-action.patch b/SOURCES/bz1920947-fence_redfish-add-diag-action.patch new file mode 100644 index 0000000..68d2cda --- /dev/null +++ b/SOURCES/bz1920947-fence_redfish-add-diag-action.patch @@ -0,0 +1,53 @@ +From 570e04d68c3595b137b104ba723aa2e6ceca5a3a Mon Sep 17 00:00:00 2001 +From: Reid Wahl +Date: Wed, 27 Jan 2021 01:45:43 -0800 +Subject: [PATCH] fence_redfish: Add diag action + +Sends NMI to fenced node. + +Ref: + - http://redfish.dmtf.org/schemas/DSP2046_2020.3.html#redfish.dmtf.org/schemas/v1/ComputerSystem.json|details|ResetType + +Resolves: RHBZ#1920947 + +Signed-off-by: Reid Wahl +--- + agents/redfish/fence_redfish.py | 6 ++++-- + tests/data/metadata/fence_redfish.xml | 1 + + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py +index 1b259576..9a7d604d 100644 +--- a/agents/redfish/fence_redfish.py ++++ b/agents/redfish/fence_redfish.py +@@ -40,7 +40,8 @@ def set_power_status(conn, options): + action = { + 'on' : "On", + 'off': "ForceOff", +- 'reboot': "ForceRestart" ++ 'reboot': "ForceRestart", ++ 'diag': "Nmi" + }[options["--action"]] + + payload = {'ResetType': action} +@@ -119,7 +120,8 @@ def define_new_opts(): + + def main(): + atexit.register(atexit_handler) +- device_opt = ["ipaddr", "login", "passwd", "redfish-uri", "systems-uri", "ssl"] ++ device_opt = ["ipaddr", "login", "passwd", "redfish-uri", "systems-uri", ++ "ssl", "diag"] + define_new_opts() + + opt = process_input(device_opt) +diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml +index 6daf2cd9..fb112781 100644 +--- a/tests/data/metadata/fence_redfish.xml ++++ b/tests/data/metadata/fence_redfish.xml +@@ -187,5 +187,6 @@ + + + ++ + + diff --git a/SOURCES/bz1925015-fence_ipmilan-add-fence_ipmilanplus.patch b/SOURCES/bz1925015-fence_ipmilan-add-fence_ipmilanplus.patch new file mode 100644 index 0000000..c642704 --- /dev/null +++ b/SOURCES/bz1925015-fence_ipmilan-add-fence_ipmilanplus.patch @@ -0,0 +1,38 @@ +From 08a4521f9361c7ca4877e691fa82cc0e8f51d707 Mon Sep 17 00:00:00 2001 +From: Thomas Renninger +Date: Wed, 3 Feb 2021 11:20:14 +0100 +Subject: [PATCH] Add fence_ipmilanplus as fence_ipmilan wrapper always + enabling lanplus + +Lanplus (IPMI protocol version 2) is the up-to-date protocol to +connect to all recent IPMI driven BMCs. +Using fence_ipmilan without lanplus=1 will fail on these. + +To get around compatibility issues (old HW might still exist), +a new fence_agent is introduced via link and basename check. +--- + agents/ipmilan/fence_ipmilan.py | 3 + + 9 files changed, 240 insertions(+) + create mode 100644 tests/data/metadata/fence_ipmilanplus.xml + +diff --git a/agents/ipmilan/fence_ipmilan.py b/agents/ipmilan/fence_ipmilan.py +index ee014e79..f751de69 100644 +--- a/agents/ipmilan/fence_ipmilan.py ++++ b/agents/ipmilan/fence_ipmilan.py +@@ -187,6 +187,8 @@ def main(): + all_opt["lanplus"]["default"] = "1" + elif os.path.basename(sys.argv[0]) == "fence_ilo5": + all_opt["lanplus"]["default"] = "1" ++ elif os.path.basename(sys.argv[0]) == "fence_ipmilanplus": ++ all_opt["lanplus"]["default"] = "1" + + all_opt["ipport"]["default"] = "623" + all_opt["method"]["help"] = "-m, --method=[method] Method to fence (onoff|cycle) (Default: onoff)\n" \ +@@ -206,6 +208,7 @@ def main(): + docs["symlink"] = [("fence_ilo3", "Fence agent for HP iLO3"), + ("fence_ilo4", "Fence agent for HP iLO4"), + ("fence_ilo5", "Fence agent for HP iLO5"), ++ ("fence_ipmilanplus", "Fence agent for IPMIv2 lanplus"), + ("fence_imm", "Fence agent for IBM Integrated Management Module"), + ("fence_idrac", "Fence agent for Dell iDRAC")] + show_docs(options, docs) diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index a020e2d..22bf45c 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: 65%{?alphatag:.%{alphatag}}%{?dist} +Release: 67%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -122,9 +122,11 @@ 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 +Patch84: bz1925015-fence_ipmilan-add-fence_ipmilanplus.patch +Patch85: bz1920947-fence_redfish-add-diag-action.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 kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti +%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 %ifarch x86_64 %global testagents virsh heuristics_ping aliyun aws azure_arm gce %endif @@ -283,6 +285,8 @@ BuildRequires: python3-google-api-client %patch81 -p1 %patch82 -p1 %patch83 -p1 +%patch84 -p1 +%patch85 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -715,6 +719,25 @@ Fence agent for GCE (Google Cloud Engine) instances. %{_mandir}/man8/fence_gce.8* %endif +%package hds-cb +License: GPLv2+ and LGPLv2+ +Summary: Fence agent for Hitachi Compute Blade systems +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif +Requires: fence-agents-common = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +BuildArch: noarch +%description hds-cb +Fence agent for Hitachi Compute Blades that are accessed via telnet. +%files hds-cb +%{_sbindir}/fence_hds_cb +%{_mandir}/man8/fence_hds_cb.8* + %package heuristics-ping License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -913,6 +936,8 @@ Fence agents for devices with IPMI interface. %{_mandir}/man8/fence_ilo4.8* %{_sbindir}/fence_ilo5 %{_mandir}/man8/fence_ilo5.8* +%{_sbindir}/fence_ipmilanplus +%{_mandir}/man8/fence_ipmilanplus.8* %{_sbindir}/fence_imm %{_mandir}/man8/fence_imm.8* @@ -1152,6 +1177,14 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Wed Mar 3 2021 Oyvind Albrigtsen - 4.2.1-67 +- fence_hds_cb: new fence agent + Resolves: rhbz#1726874 +- fence_ipmilanplus: new symlink agent with lanplus enabled by default + Resolves: rhbz#1925015 +- fence_redfish: add diag action + Resolves: rhbz#1920947 + * Tue Feb 2 2021 Oyvind Albrigtsen - 4.2.1-65 - fence_gce: default to onoff Resolves: rhbz#1906978