From 1fb091fbe0cc3130e6949c18babd769c70d26065 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 23 Oct 2023 10:39:38 +0200 Subject: [PATCH] - all agents: update metadata in non-I/O agents to Power or Network fencing Resolves: RHEL-14031 --- ...nts-metadata-update-IO-Power-Network.patch | 0 ...fence_cisco_mds-undo-metadata-change.patch | 35 +++++++++++++++++++ fence-agents.spec | 14 +++++--- 3 files changed, 44 insertions(+), 5 deletions(-) rename RHEL-14031-all-agents-metadata-update-IO-Power-Network.patch => RHEL-14031-1-all-agents-metadata-update-IO-Power-Network.patch (100%) create mode 100644 RHEL-14031-2-fence_cisco_mds-undo-metadata-change.patch diff --git a/RHEL-14031-all-agents-metadata-update-IO-Power-Network.patch b/RHEL-14031-1-all-agents-metadata-update-IO-Power-Network.patch similarity index 100% rename from RHEL-14031-all-agents-metadata-update-IO-Power-Network.patch rename to RHEL-14031-1-all-agents-metadata-update-IO-Power-Network.patch diff --git a/RHEL-14031-2-fence_cisco_mds-undo-metadata-change.patch b/RHEL-14031-2-fence_cisco_mds-undo-metadata-change.patch new file mode 100644 index 0000000..a80b818 --- /dev/null +++ b/RHEL-14031-2-fence_cisco_mds-undo-metadata-change.patch @@ -0,0 +1,35 @@ +From 639732ddca765b2f147ef0c0a896968e3304ca49 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Mon, 23 Oct 2023 09:28:55 +0200 +Subject: [PATCH] fence_cisco_mds: undo metadata change, as it is an I/O agent + +--- + agents/cisco_mds/fence_cisco_mds.py | 2 +- + tests/data/metadata/fence_cisco_mds.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/agents/cisco_mds/fence_cisco_mds.py b/agents/cisco_mds/fence_cisco_mds.py +index 04cd1f842..fbb876a94 100644 +--- a/agents/cisco_mds/fence_cisco_mds.py ++++ b/agents/cisco_mds/fence_cisco_mds.py +@@ -77,7 +77,7 @@ def main(): + + docs = {} + docs["shortdesc"] = "Fence agent for Cisco MDS" +- docs["longdesc"] = "fence_cisco_mds is a Power Fencing agent \ ++ docs["longdesc"] = "fence_cisco_mds is an I/O Fencing agent \ + which can be used with any Cisco MDS 9000 series with SNMP enabled device." + docs["vendorurl"] = "http://www.cisco.com" + show_docs(options, docs) +diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml +index 2105ecccc..829c9dcbe 100644 +--- a/tests/data/metadata/fence_cisco_mds.xml ++++ b/tests/data/metadata/fence_cisco_mds.xml +@@ -1,6 +1,6 @@ + + +-fence_cisco_mds is a Power Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device. ++fence_cisco_mds is an I/O Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device. + http://www.cisco.com + + diff --git a/fence-agents.spec b/fence-agents.spec index 5bd5170..051afed 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: 124%{?alphatag:.%{alphatag}}%{?dist} +Release: 125%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -275,7 +275,8 @@ Patch132: bz2211460-fence_azure-arm-1-stack-hub-support.patch Patch133: bz2211460-fence_azure-arm-2-metadata-endpoint-error-message.patch Patch134: bz2155453-fence_ibm_powervs-performance-improvements.patch Patch135: RHEL-14343-fence_zvmip-document-user-permissions.patch -Patch136: RHEL-14031-all-agents-metadata-update-IO-Power-Network.patch +Patch136: RHEL-14031-1-all-agents-metadata-update-IO-Power-Network.patch +Patch137: RHEL-14031-2-fence_cisco_mds-undo-metadata-change.patch ### HA support libs/utils ### # all archs @@ -498,6 +499,7 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja %patch134 -p1 %patch135 -p1 %patch136 -p1 -F2 +%patch137 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1506,13 +1508,15 @@ Fence agent for IBM z/VM over IP. %endif %changelog -* Fri Oct 20 2023 Oyvind Albrigtsen - 4.2.1-124 -- fence_zvmip: document required user permissions in metadata/manpage - Resolves: RHEL-14343 +* Mon Oct 23 2023 Oyvind Albrigtsen - 4.2.1-125 - all agents: update metadata in non-I/O agents to Power or Network fencing Resolves: RHEL-14031 +* Fri Oct 20 2023 Oyvind Albrigtsen - 4.2.1-124 +- fence_zvmip: document required user permissions in metadata/manpage + Resolves: RHEL-14343 + * Thu Oct 12 2023 Oyvind Albrigtsen - 4.2.1-123 - bundled urllib3: fix CVE-2023-43804 Resolves: RHEL-11988