- all agents: update metadata in non-I/O agents to Power or Network
fencing Resolves: RHEL-14030
This commit is contained in:
parent
9a5b7df79a
commit
1773809a1c
35
RHEL-14030-2-fence_cisco_mds-undo-metadata-change.patch
Normal file
35
RHEL-14030-2-fence_cisco_mds-undo-metadata-change.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 639732ddca765b2f147ef0c0a896968e3304ca49 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
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 @@
|
||||
<?xml version="1.0" ?>
|
||||
<resource-agent name="fence_cisco_mds" shortdesc="Fence agent for Cisco MDS" >
|
||||
-<longdesc>fence_cisco_mds is a Power Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device.</longdesc>
|
||||
+<longdesc>fence_cisco_mds is an I/O Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device.</longdesc>
|
||||
<vendor-url>http://www.cisco.com</vendor-url>
|
||||
<parameters>
|
||||
<parameter name="action" unique="0" required="1">
|
@ -59,7 +59,7 @@
|
||||
Name: fence-agents
|
||||
Summary: Set of unified programs capable of host isolation ("fencing")
|
||||
Version: 4.10.0
|
||||
Release: 59%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Release: 60%{?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
|
||||
@ -239,7 +239,8 @@ Patch46: bz2224267-fence_ipmilan-fix-typos-in-metadata.patch
|
||||
Patch47: RHEL-5396-fence_scsi-1-fix-ISID-reg-handling.patch
|
||||
Patch48: RHEL-5396-fence_scsi-2-fix-ISID-reg-handling-off.patch
|
||||
Patch49: RHEL-14344-fence_zvmip-document-user-permissions.patch
|
||||
Patch50: RHEL-14030-all-agents-metadata-update-IO-Power-Network.patch
|
||||
Patch50: RHEL-14030-1-all-agents-metadata-update-IO-Power-Network.patch
|
||||
Patch51: RHEL-14030-2-fence_cisco_mds-undo-metadata-change.patch
|
||||
|
||||
### HA support libs/utils ###
|
||||
# all archs
|
||||
@ -409,6 +410,7 @@ BuildRequires: %{systemd_units}
|
||||
%patch -p1 -P 48
|
||||
%patch -p1 -P 49
|
||||
%patch -p1 -P 50
|
||||
%patch -p1 -P 51
|
||||
|
||||
# prevent compilation of something that won't get used anyway
|
||||
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
|
||||
@ -1487,13 +1489,15 @@ are located on corosync cluster nodes.
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Oct 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-59
|
||||
- fence_zvmip: document required user permissions in metadata/manpage
|
||||
Resolves: RHEL-14344
|
||||
* Mon Oct 23 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-60
|
||||
- all agents: update metadata in non-I/O agents to Power or Network
|
||||
fencing
|
||||
Resolves: RHEL-14030
|
||||
|
||||
* Fri Oct 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-59
|
||||
- fence_zvmip: document required user permissions in metadata/manpage
|
||||
Resolves: RHEL-14344
|
||||
|
||||
* Wed Oct 11 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-57
|
||||
- bundled urllib3: fix CVE-2023-43804
|
||||
Resolves: RHEL-11999
|
||||
|
Loading…
Reference in New Issue
Block a user