rpms/fence-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fence_zvmip: document required user permissions in metadata/manpage

Browse Source 
Resolves: RHEL-14344
- all agents: update metadata in non-I/O agents to Power or Network
  fencing
  Resolves: RHEL-14030
This commit is contained in:
Oyvind Albrigtsen 2023-10-20 10:48:59 +02:00
parent 2f7a46e435
commit 9a5b7df79a
3 changed files with 388 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

302
RHEL-14030-all-agents-metadata-update-IO-Power-Network.patch
View File

@ -1,4 +1,4 @@
From fb78d8fb323a30be333b651d11c8b02af0bbc66d Mon Sep 17 00:00:00 2001
From aed06661b0b6fd4e69d44672f59bb8d3eecccc67 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 18 Oct 2023 10:53:14 +0200
Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
@ -10,7 +10,7 @@ Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
agents/amt/fence_amt.py | 2 +-
agents/amt_ws/fence_amt_ws.py | 2 +-
agents/apc/fence_apc.py | 2 +-
agents/apc_snmp/fence_apc_snmp.py | 2 +-
agents/apc_snmp/fence_apc_snmp.py | 6 +++---
agents/aws/fence_aws.py | 2 +-
agents/azure_arm/fence_azure_arm.py | 2 +-
agents/bladecenter/fence_bladecenter.py | 2 +-
@ -19,7 +19,7 @@ Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
agents/cisco_ucs/fence_cisco_ucs.py | 2 +-
agents/cyberpower_ssh/fence_cyberpower_ssh.py | 2 +-
agents/docker/fence_docker.py | 2 +-
agents/drac/fence_drac.py | 2 +-
agents/drac/fence_drac.py | 4 ++--
agents/drac5/fence_drac5.py | 2 +-
agents/eaton_snmp/fence_eaton_snmp.py | 2 +-
agents/eaton_ssh/fence_eaton_ssh.py | 2 +-
@ -33,35 +33,37 @@ Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
agents/ibm_vpc/fence_ibm_vpc.py | 2 +-
agents/ibmblade/fence_ibmblade.py | 2 +-
agents/ibmz/fence_ibmz.py | 2 +-
agents/ilo/fence_ilo.py | 2 +-
agents/ilo/fence_ilo.py | 6 +++---
agents/ilo_moonshot/fence_ilo_moonshot.py | 2 ++
agents/ilo_mp/fence_ilo_mp.py | 3 ++-
agents/ilo_ssh/fence_ilo_ssh.py | 2 +-
agents/ilo_ssh/fence_ilo_ssh.py | 6 +++---
agents/intelmodular/fence_intelmodular.py | 2 +-
agents/ipdu/fence_ipdu.py | 2 +-
agents/ipmilan/fence_ipmilan.py | 2 +-
agents/ipmilan/fence_ipmilan.py | 4 ++--
agents/ironic/fence_ironic.py | 2 +-
agents/kubevirt/fence_kubevirt.py | 2 +-
agents/ldom/fence_ldom.py | 2 +-
agents/lindy_pdu/fence_lindypdu.py | 2 +-
agents/lpar/fence_lpar.py | 2 +-
agents/mpath/fence_mpath.py | 2 +-
agents/netio/fence_netio.py | 2 +-
agents/netio/fence_netio.py | 4 ++--
agents/openstack/fence_openstack.py | 2 +-
agents/ovh/fence_ovh.py | 2 +-
agents/powerman/fence_powerman.py | 2 +-
agents/pve/fence_pve.py | 4 ++--
agents/raritan/fence_raritan.py | 2 +-
agents/raritan_px3/fence_raritan_px3.py | 2 +-
agents/raritan/fence_raritan.py | 4 ++--
agents/raritan_px3/fence_raritan_px3.py | 4 ++--
agents/rcd_serial/fence_rcd_serial.py | 11 ++++++-----
agents/redfish/fence_redfish.py | 2 +-
agents/redfish/fence_redfish.py | 4 ++--
agents/rhevm/fence_rhevm.py | 2 +-
agents/rsa/fence_rsa.py | 2 +-
agents/rsb/fence_rsb.py | 2 +-
agents/rsb/fence_rsb.py | 4 ++--
agents/sbd/fence_sbd.py | 2 +-
agents/scsi/fence_scsi.py | 2 +-
agents/skalar/fence_skalar.py | 2 +-
agents/vbox/fence_vbox.py | 2 +-
agents/virsh/fence_virsh.py | 2 +-
agents/virt/client/options.c | 2 +-
agents/vmware/fence_vmware.py | 2 +-
agents/vmware_rest/fence_vmware_rest.py | 2 +-
agents/vmware_soap/fence_vmware_soap.py | 2 +-
@ -83,7 +85,7 @@ Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
tests/data/metadata/fence_cisco_ucs.xml | 2 +-
tests/data/metadata/fence_cyberpower_ssh.xml | 2 +-
tests/data/metadata/fence_docker.xml | 2 +-
tests/data/metadata/fence_drac.xml | 2 +-
tests/data/metadata/fence_drac.xml | 4 ++--
tests/data/metadata/fence_drac5.xml | 2 +-
tests/data/metadata/fence_eaton_snmp.xml | 2 +-
tests/data/metadata/fence_eaton_ssh.xml | 2 +-
@ -119,23 +121,25 @@ Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
tests/data/metadata/fence_lindypdu.xml | 2 +-
tests/data/metadata/fence_lpar.xml | 2 +-
tests/data/metadata/fence_mpath.xml | 2 +-
tests/data/metadata/fence_netio.xml | 2 +-
tests/data/metadata/fence_netio.xml | 4 ++--
tests/data/metadata/fence_openstack.xml | 2 +-
tests/data/metadata/fence_ovh.xml | 2 +-
tests/data/metadata/fence_powerman.xml | 2 +-
tests/data/metadata/fence_pve.xml | 2 +-
tests/data/metadata/fence_raritan.xml | 2 +-
tests/data/metadata/fence_raritan_px3.xml | 2 +-
tests/data/metadata/fence_raritan.xml | 4 ++--
tests/data/metadata/fence_raritan_px3.xml | 4 ++--
tests/data/metadata/fence_rcd_serial.xml | 2 +-
tests/data/metadata/fence_redfish.xml | 2 +-
tests/data/metadata/fence_redfish.xml | 4 ++--
tests/data/metadata/fence_rhevm.xml | 2 +-
tests/data/metadata/fence_rsa.xml | 2 +-
tests/data/metadata/fence_rsb.xml | 2 +-
tests/data/metadata/fence_rsb.xml | 4 ++--
tests/data/metadata/fence_sbd.xml | 2 +-
tests/data/metadata/fence_scsi.xml | 2 +-
tests/data/metadata/fence_skalar.xml | 2 +-
tests/data/metadata/fence_tripplite_snmp.xml | 2 +-
tests/data/metadata/fence_vbox.xml | 2 +-
tests/data/metadata/fence_virsh.xml | 2 +-
tests/data/metadata/fence_virt.xml | 2 +-
tests/data/metadata/fence_vmware.xml | 2 +-
tests/data/metadata/fence_vmware_rest.xml | 2 +-
tests/data/metadata/fence_vmware_soap.xml | 2 +-
@ -143,7 +147,7 @@ Subject: [PATCH] all agents: update metadata from I/O to e.g. Power, Network,
tests/data/metadata/fence_wti.xml | 2 +-
tests/data/metadata/fence_xenapi.xml | 2 +-
tests/data/metadata/fence_zvmip.xml | 3 +--
138 files changed, 150 insertions(+), 146 deletions(-)
142 files changed, 173 insertions(+), 169 deletions(-)
diff --git a/agents/aliyun/fence_aliyun.py b/agents/aliyun/fence_aliyun.py
index c7785a2b2..134cc5ab6 100644
@ -213,18 +217,31 @@ index 3ea0f37d6..bc52aa244 100644
via telnet/ssh and reboots a specified outlet. Lengthy telnet/ssh connections \
should be avoided while a GFS cluster is running because the connection \
diff --git a/agents/apc_snmp/fence_apc_snmp.py b/agents/apc_snmp/fence_apc_snmp.py
index cd601662c..1dd330d00 100644
index cd601662c..1091f0da9 100644
--- a/agents/apc_snmp/fence_apc_snmp.py
+++ b/agents/apc_snmp/fence_apc_snmp.py
@@ -216,7 +216,7 @@ def main():
@@ -13,7 +13,7 @@
# - Tripplite PDUMH20HVNET 12.04.0055 - SNMP v1, v2c, v3
# - Tripplite PDU15NETLX 15.5.4 - SNMP v1, v2c, v3
-import sys
+import sys, os
import atexit
import logging
sys.path.append("@FENCEAGENTSLIBDIR@")
@@ -216,10 +216,10 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for APC, Tripplite PDU over SNMP"
- docs["longdesc"] = "fence_apc_snmp is an I/O Fencing agent \
+ docs["longdesc"] = "fence_apc_snmp is a Power Fencing agent \
+ docs["longdesc"] = "{} is a Power Fencing agent \
which can be used with the APC network power switch or Tripplite PDU devices.\
It logs into a device via SNMP and reboots a specified outlet. It supports \
SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings."
-SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings."
+SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.".format(os.path.basename(__file__))
docs["vendorurl"] = "http://www.apc.com"
docs["symlink"] = [("fence_tripplite_snmp", "Fence agent for Tripplife over SNMP")]
show_docs(options, docs)
diff --git a/agents/aws/fence_aws.py b/agents/aws/fence_aws.py
index 0a375bbec..5b32106f0 100644
--- a/agents/aws/fence_aws.py
@ -317,14 +334,16 @@ index 004402518..8042515a3 100644
fence-agent without any authentication, or you can use TLS authentication \
(use --ssl option, more info about TLS authentication in docker: \
diff --git a/agents/drac/fence_drac.py b/agents/drac/fence_drac.py
index be3e9a584..f693d2478 100644
index be3e9a584..b7d335640 100644
--- a/agents/drac/fence_drac.py
+++ b/agents/drac/fence_drac.py
@@ -35,7 +35,7 @@ def main():
@@ -34,8 +34,8 @@ def main():
options = check_input(device_opt, opt)
docs = {}
docs["shortdesc"] = "I/O Fencing agent for Dell DRAC IV"
- docs["shortdesc"] = "I/O Fencing agent for Dell DRAC IV"
- docs["longdesc"] = "fence_drac is an I/O Fencing agent which can be used with \
+ docs["shortdesc"] = "Power Fencing agent for Dell DRAC IV"
+ docs["longdesc"] = "fence_drac is a Power Fencing agent which can be used with \
the Dell Remote Access Card (DRAC). This card provides remote access to controlling \
power to a server. It logs into the DRAC through the telnet interface of the card. By \
@ -475,18 +494,32 @@ index d477adeb9..a4cc12d5c 100644
"vendorurl": "http://www.ibm.com"
}
diff --git a/agents/ilo/fence_ilo.py b/agents/ilo/fence_ilo.py
index 612450568..07dc2b2f5 100644
index 612450568..f30a1da28 100644
--- a/agents/ilo/fence_ilo.py
+++ b/agents/ilo/fence_ilo.py
@@ -73,7 +73,7 @@ def main():
@@ -11,7 +11,7 @@
## iLO2 / firmware 1.50 / RIBCL 2.22
#####
-import sys, re
+import sys, os, re
sys.path.insert(0, '/usr/lib/fence-agents/support/common')
try:
import pexpect
@@ -73,11 +73,11 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for HP iLO"
- docs["longdesc"] = "fence_ilo is an I/O Fencing agent \
+ docs["longdesc"] = "fence_ilo is a Power Fencing agent \
+ docs["longdesc"] = "{} is a Power Fencing agent \
used for HP servers with the Integrated Light Out (iLO) PCI card.\
The agent opens an SSL connection to the iLO card. Once the SSL \
connection is established, the agent is able to communicate with \
-the iLO card through an XML stream."
+the iLO card through an XML stream.".format(os.path.basename(__file__))
docs["vendorurl"] = "http://www.hp.com"
docs["symlink"] = [("fence_ilo2", "Fence agent for HP iLO2")]
show_docs(options, docs)
diff --git a/agents/ilo_moonshot/fence_ilo_moonshot.py b/agents/ilo_moonshot/fence_ilo_moonshot.py
index 1923eeb1c..92bc74525 100644
--- a/agents/ilo_moonshot/fence_ilo_moonshot.py
@ -515,18 +548,31 @@ index 1ae4d3ed5..cc1c2decd 100644
show_docs(options, docs)
diff --git a/agents/ilo_ssh/fence_ilo_ssh.py b/agents/ilo_ssh/fence_ilo_ssh.py
index a27e34189..e22ee9acc 100644
index a27e34189..1d5be21ef 100644
--- a/agents/ilo_ssh/fence_ilo_ssh.py
+++ b/agents/ilo_ssh/fence_ilo_ssh.py
@@ -50,7 +50,7 @@ def main():
@@ -1,6 +1,6 @@
#!@PYTHON@ -tt
-import sys, re
+import sys, os, re
import atexit
import logging
sys.path.append("@FENCEAGENTSLIBDIR@")
@@ -50,11 +50,11 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for HP iLO over SSH"
- docs["longdesc"] = "fence_ilo_ssh is a fence agent that connects to iLO device. It logs into \
+ docs["longdesc"] = "fence_ilo_ssh is a Power Fencing agent that connects to iLO device. It logs into \
+ docs["longdesc"] = "{} is a Power Fencing agent that connects to iLO device. It logs into \
device via ssh and reboot a specified outlet.\
\n.P\n\
WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent \
-to avoid this issue."
+to avoid this issue.".format(os.path.basename(__file__))
docs["vendorurl"] = "http://www.hp.com"
docs["symlink"] = [("fence_ilo3_ssh", "Fence agent for HP iLO3 over SSH"),
("fence_ilo4_ssh", "Fence agent for HP iLO4 over SSH"),
diff --git a/agents/intelmodular/fence_intelmodular.py b/agents/intelmodular/fence_intelmodular.py
index 294ea4ddb..e9c417a95 100644
--- a/agents/intelmodular/fence_intelmodular.py
@ -554,18 +600,23 @@ index da34d2b64..f7093b8bc 100644
into a device via SNMP and reboots a specified outlet. It supports \
SNMP v3 with all combinations of authenticity/privacy settings."
diff --git a/agents/ipmilan/fence_ipmilan.py b/agents/ipmilan/fence_ipmilan.py
index 91e09ac7d..b4695e81c 100644
index 91e09ac7d..a47fbdd82 100644
--- a/agents/ipmilan/fence_ipmilan.py
+++ b/agents/ipmilan/fence_ipmilan.py
@@ -203,7 +203,7 @@ def main():
@@ -203,11 +203,11 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for IPMI"
- docs["longdesc"] = "fence_ipmilan is an I/O Fencing agent \
+ docs["longdesc"] = "fence_ipmilan is an Power Fencing agent \
+ docs["longdesc"] = "{} is a Power Fencing agent \
which can be used with machines controlled by IPMI. \
This agent calls support software ipmitool (http://ipmitool.sf.net/). \
WARNING! This fence agent might report success before the node is powered off. \
-You should use -m/method onoff if your fence device works correctly with that option."
+You should use -m/method onoff if your fence device works correctly with that option.".format(os.path.basename(__file__))
docs["vendorurl"] = ""
docs["symlink"] = [("fence_ilo3", "Fence agent for HP iLO3"),
("fence_ilo4", "Fence agent for HP iLO4"),
diff --git a/agents/ironic/fence_ironic.py b/agents/ironic/fence_ironic.py
index d0c9d9c19..76a9250f1 100644
--- a/agents/ironic/fence_ironic.py
@ -645,14 +696,16 @@ index 6976fee90..0e5d9ed30 100644
devices must support SCSI-3 persistent reservations (SPC-3 or greater) as \
well as the \"preempt-and-abort\" subcommand.\nThe fence_mpath agent works by \
diff --git a/agents/netio/fence_netio.py b/agents/netio/fence_netio.py
index 4fb59cffc..93ed1c89c 100755
index 4fb59cffc..fc3bf9d83 100755
--- a/agents/netio/fence_netio.py
+++ b/agents/netio/fence_netio.py
@@ -59,7 +59,7 @@ def main():
@@ -58,8 +58,8 @@ def main():
options = check_input(device_opt, opt)
docs = {}
docs["shortdesc"] = "I/O Fencing agent for Koukaam NETIO-230B"
- docs["shortdesc"] = "I/O Fencing agent for Koukaam NETIO-230B"
- docs["longdesc"] = "fence_netio is an I/O Fencing agent which can be \
+ docs["shortdesc"] = "Power Fencing agent for Koukaam NETIO-230B"
+ docs["longdesc"] = "fence_netio is a Power Fencing agent which can be \
used with the Koukaam NETIO-230B Power Distribution Unit. It logs into \
device via telnet and reboots a specified outlet. Lengthy telnet connections \
@ -712,14 +765,16 @@ index 0d820355f..f97007dc5 100755
show_docs(options, docs)
diff --git a/agents/raritan/fence_raritan.py b/agents/raritan/fence_raritan.py
index 169fa8197..39d805f4c 100644
index 169fa8197..d3510e4a1 100644
--- a/agents/raritan/fence_raritan.py
+++ b/agents/raritan/fence_raritan.py
@@ -40,7 +40,7 @@ def main():
@@ -39,8 +39,8 @@ def main():
options = check_input(device_opt, opt)
docs = {}
docs["shortdesc"] = "I/O Fencing agent for Raritan Dominion PX"
- docs["shortdesc"] = "I/O Fencing agent for Raritan Dominion PX"
- docs["longdesc"] = "fence_raritan is an I/O Fencing agent which can be \
+ docs["shortdesc"] = "Power Fencing agent for Raritan Dominion PX"
+ docs["longdesc"] = "fence_raritan is a Power Fencing agent which can be \
used with the Raritan DPXS12-20 Power Distribution Unit. It logs into \
device via telnet and reboots a specified outlet. Lengthy telnet connections \
@ -747,14 +802,16 @@ index 2614772ff..d14b4c661 100644
show_docs(options, docs)
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
index 0f5af523c..c9190342b 100644
index 0f5af523c..a935122ec 100644
--- a/agents/redfish/fence_redfish.py
+++ b/agents/redfish/fence_redfish.py
@@ -133,7 +133,7 @@ def main():
@@ -132,8 +132,8 @@ def main():
options = check_input(device_opt, opt)
docs = {}
docs["shortdesc"] = "I/O Fencing agent for Redfish"
- docs["shortdesc"] = "I/O Fencing agent for Redfish"
- docs["longdesc"] = "fence_redfish is an I/O Fencing agent which can be used with \
+ docs["shortdesc"] = "Power Fencing agent for Redfish"
+ docs["longdesc"] = "fence_redfish is a Power Fencing agent which can be used with \
Out-of-Band controllers that support Redfish APIs. These controllers provide remote \
access to control power on a server."
@ -786,14 +843,16 @@ index 44fdd9d05..79ed109eb 100644
logs into an RSA II device via telnet and reboots the associated \
machine. Lengthy telnet connections to the RSA II device should \
diff --git a/agents/rsb/fence_rsb.py b/agents/rsb/fence_rsb.py
index 45355f51e..58eaf2ba8 100755
index 45355f51e..e4622ae9f 100755
--- a/agents/rsb/fence_rsb.py
+++ b/agents/rsb/fence_rsb.py
@@ -50,7 +50,7 @@ def main():
@@ -49,8 +49,8 @@ def main():
options = check_input(device_opt, opt)
docs = {}
docs["shortdesc"] = "I/O Fencing agent for Fujitsu-Siemens RSB"
- docs["shortdesc"] = "I/O Fencing agent for Fujitsu-Siemens RSB"
- docs["longdesc"] = "fence_rsb is an I/O Fencing agent \
+ docs["shortdesc"] = "Power Fencing agent for Fujitsu-Siemens RSB"
+ docs["longdesc"] = "fence_rsb is a Power Fencing agent \
which can be used with the Fujitsu-Siemens RSB management interface. It logs \
into device via telnet/ssh and reboots a specified outlet. Lengthy telnet/ssh \
@ -811,6 +870,19 @@ index 2b0127d55..5c498263e 100644
which can be used in environments where sbd can be used (shared storage)."
docs["vendorurl"] = ""
show_docs(options, docs)
diff --git a/agents/scsi/fence_scsi.py b/agents/scsi/fence_scsi.py
index 519319bf5..5cb5dbee9 100644
--- a/agents/scsi/fence_scsi.py
+++ b/agents/scsi/fence_scsi.py
@@ -546,7 +546,7 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for SCSI persistent reservation"
- docs["longdesc"] = "fence_scsi is an I/O fencing agent that uses SCSI-3 \
+ docs["longdesc"] = "fence_scsi is an I/O Fencing agent that uses SCSI-3 \
persistent reservations to control access to shared storage devices. These \
devices must support SCSI-3 persistent reservations (SPC-3 or greater) as \
well as the \"preempt-and-abort\" subcommand.\nThe fence_scsi agent works by \
diff --git a/agents/skalar/fence_skalar.py b/agents/skalar/fence_skalar.py
index 0e11d83f9..c8589c1a4 100644
--- a/agents/skalar/fence_skalar.py
@ -850,6 +922,19 @@ index 88cee48de..bde189c2b 100644
which can be used with the virtual machines managed by libvirt. \
It logs via ssh to a dom0 and there run virsh command, which does \
all work. \
diff --git a/agents/virt/client/options.c b/agents/virt/client/options.c
index ddd6bc4e0..ce7ba14da 100644
--- a/agents/virt/client/options.c
+++ b/agents/virt/client/options.c
@@ -765,7 +765,7 @@ args_metadata(char *progname, const char *optstr)
printf("<?xml version=\"1.0\" ?>\n");
printf("<resource-agent name=\"%s\" shortdesc=\"Fence agent for virtual machines\">\n", basename(progname));
- printf("<longdesc>%s is an I/O Fencing agent which can be used with "
+ printf("<longdesc>%s is a Power Fencing agent which can be used with "
"virtual machines.\n\nNOTE: reboot-action does not power on nodes that are powered off."
"</longdesc>\n", basename(progname));
printf("<vendor-url>https://libvirt.org</vendor-url>\n");
diff --git a/agents/vmware/fence_vmware.py b/agents/vmware/fence_vmware.py
index bc1785f4c..ccef92bb2 100644
--- a/agents/vmware/fence_vmware.py
@ -929,6 +1014,21 @@ index 10c8ee03e..884fbc79f 100644
It uses the XenAPI, supplied by Citrix, to establish an XML-RPC session \
to a XenServer host. Once the session is established, further XML-RPC \
commands are issued in order to switch on, switch off, restart and query \
diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py
index c37950a20..f1cea2652 100644
--- a/agents/zvm/fence_zvmip.py
+++ b/agents/zvm/fence_zvmip.py
@@ -199,8 +199,8 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for use with z/VM Virtual Machines"
- docs["longdesc"] = """The fence_zvmip agent is intended to be used with the
-z/VM SMAPI service via TCP/IP.
+ docs["longdesc"] = """fence_zvmip is a Power Fencing agent for z/VM \
+SMAPI service via TCP/IP.
The z/VM SMAPI service must be configured so that the virtual machine running
the agent can connect to the service, access the system's directory manager,
diff --git a/tests/data/metadata/fence_aliyun.xml b/tests/data/metadata/fence_aliyun.xml
index b06718891..a52de014c 100644
--- a/tests/data/metadata/fence_aliyun.xml
@ -1087,13 +1187,14 @@ index f685b1162..f0cacd4d9 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_drac.xml b/tests/data/metadata/fence_drac.xml
index a99126132..088828f59 100644
index a99126132..b2ce0825f 100644
--- a/tests/data/metadata/fence_drac.xml
+++ b/tests/data/metadata/fence_drac.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_drac" shortdesc="I/O Fencing agent for Dell DRAC IV" >
-<resource-agent name="fence_drac" shortdesc="I/O Fencing agent for Dell DRAC IV" >
-<longdesc>fence_drac is an I/O Fencing agent which can be used with the Dell Remote Access Card (DRAC). This card provides remote access to controlling power to a server. It logs into the DRAC through the telnet interface of the card. By default, the telnet interface is not enabled. To enable the interface, you will need to use the racadm command in the racser-devel rpm available from Dell. To enable telnet on the DRAC: [root]# racadm config -g cfgSerial -o cfgSerialTelnetEnable 1 [root]# racadm racreset </longdesc>
+<resource-agent name="fence_drac" shortdesc="Power Fencing agent for Dell DRAC IV" >
+<longdesc>fence_drac is a Power Fencing agent which can be used with the Dell Remote Access Card (DRAC). This card provides remote access to controlling power to a server. It logs into the DRAC through the telnet interface of the card. By default, the telnet interface is not enabled. To enable the interface, you will need to use the racadm command in the racser-devel rpm available from Dell. To enable telnet on the DRAC: [root]# racadm config -g cfgSerial -o cfgSerialTelnetEnable 1 [root]# racadm racreset </longdesc>
<vendor-url>http://www.dell.com</vendor-url>
<parameters>
@ -1231,7 +1332,7 @@ index ba74fa6fe..7554d4d78 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
index d1f283e4a..a74c1b647 100644
index d1f283e4a..aa291345a 100644
--- a/tests/data/metadata/fence_idrac.xml
+++ b/tests/data/metadata/fence_idrac.xml
@@ -6,7 +6,7 @@
@ -1239,7 +1340,7 @@ index d1f283e4a..a74c1b647 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_idrac is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
@ -1257,7 +1358,7 @@ index 0bac03c83..f8fe61cbb 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ilo2.xml b/tests/data/metadata/fence_ilo2.xml
index 3d954a345..bfb2dfc6f 100644
index 3d954a345..d7e72084e 100644
--- a/tests/data/metadata/fence_ilo2.xml
+++ b/tests/data/metadata/fence_ilo2.xml
@@ -1,7 +1,7 @@
@ -1265,12 +1366,12 @@ index 3d954a345..bfb2dfc6f 100644
<resource-agent name="fence_ilo2" shortdesc="Fence agent for HP iLO" >
<symlink name="fence_ilo2" shortdesc="Fence agent for HP iLO2"/>
-<longdesc>fence_ilo is an I/O Fencing agent used for HP servers with the Integrated Light Out (iLO) PCI card.The agent opens an SSL connection to the iLO card. Once the SSL connection is established, the agent is able to communicate with the iLO card through an XML stream.</longdesc>
+<longdesc>fence_ilo is a Power Fencing agent used for HP servers with the Integrated Light Out (iLO) PCI card.The agent opens an SSL connection to the iLO card. Once the SSL connection is established, the agent is able to communicate with the iLO card through an XML stream.</longdesc>
+<longdesc>fence_ilo2 is a Power Fencing agent used for HP servers with the Integrated Light Out (iLO) PCI card.The agent opens an SSL connection to the iLO card. Once the SSL connection is established, the agent is able to communicate with the iLO card through an XML stream.</longdesc>
<vendor-url>http://www.hp.com</vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
index 5aca0211b..fdb0dd82f 100644
index 5aca0211b..90dc2f657 100644
--- a/tests/data/metadata/fence_ilo3.xml
+++ b/tests/data/metadata/fence_ilo3.xml
@@ -6,7 +6,7 @@
@ -1278,12 +1379,12 @@ index 5aca0211b..fdb0dd82f 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ilo3 is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ilo3_ssh.xml b/tests/data/metadata/fence_ilo3_ssh.xml
index e2a25661d..56db8faf9 100644
index e2a25661d..f46ec7d13 100644
--- a/tests/data/metadata/fence_ilo3_ssh.xml
+++ b/tests/data/metadata/fence_ilo3_ssh.xml
@@ -3,7 +3,7 @@
@ -1291,12 +1392,12 @@ index e2a25661d..56db8faf9 100644
<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
-<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
+<longdesc>fence_ilo_ssh is a Power Fencing agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
+<longdesc>fence_ilo3_ssh is a Power Fencing agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
<vendor-url>http://www.hp.com</vendor-url>
diff --git a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
index 3aa001ad2..7a25bd54e 100644
index 3aa001ad2..494ff0b3b 100644
--- a/tests/data/metadata/fence_ilo4.xml
+++ b/tests/data/metadata/fence_ilo4.xml
@@ -6,7 +6,7 @@
@ -1304,12 +1405,12 @@ index 3aa001ad2..7a25bd54e 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ilo4 is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ilo4_ssh.xml b/tests/data/metadata/fence_ilo4_ssh.xml
index 4fd6b2ef1..c3494cce6 100644
index 4fd6b2ef1..e2a5b7167 100644
--- a/tests/data/metadata/fence_ilo4_ssh.xml
+++ b/tests/data/metadata/fence_ilo4_ssh.xml
@@ -3,7 +3,7 @@
@ -1317,12 +1418,12 @@ index 4fd6b2ef1..c3494cce6 100644
<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
-<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
+<longdesc>fence_ilo_ssh is a Power Fencing agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
+<longdesc>fence_ilo4_ssh is a Power Fencing agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
<vendor-url>http://www.hp.com</vendor-url>
diff --git a/tests/data/metadata/fence_ilo5.xml b/tests/data/metadata/fence_ilo5.xml
index 262787905..54dd4f097 100644
index 262787905..25e7446b3 100644
--- a/tests/data/metadata/fence_ilo5.xml
+++ b/tests/data/metadata/fence_ilo5.xml
@@ -6,7 +6,7 @@
@ -1330,12 +1431,12 @@ index 262787905..54dd4f097 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ilo5 is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ilo5_ssh.xml b/tests/data/metadata/fence_ilo5_ssh.xml
index 036aec5c6..4e3054889 100644
index 036aec5c6..f4bd8622b 100644
--- a/tests/data/metadata/fence_ilo5_ssh.xml
+++ b/tests/data/metadata/fence_ilo5_ssh.xml
@@ -3,7 +3,7 @@
@ -1343,7 +1444,7 @@ index 036aec5c6..4e3054889 100644
<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
-<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
+<longdesc>fence_ilo_ssh is a Power Fencing agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
+<longdesc>fence_ilo5_ssh is a Power Fencing agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.
WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
<vendor-url>http://www.hp.com</vendor-url>
@ -1373,7 +1474,7 @@ index 2e1cb84b2..7564200da 100644
WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
<vendor-url>http://www.hp.com</vendor-url>
diff --git a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
index 26f9a76d3..4e6f5d7c1 100644
index 26f9a76d3..943e9c3f2 100644
--- a/tests/data/metadata/fence_imm.xml
+++ b/tests/data/metadata/fence_imm.xml
@@ -6,7 +6,7 @@
@ -1381,7 +1482,7 @@ index 26f9a76d3..4e6f5d7c1 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_imm is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
@ -1410,7 +1511,7 @@ index 22024a7a1..941dcbedf 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
index daad65a70..f7b6d0cee 100644
index daad65a70..3107cad33 100644
--- a/tests/data/metadata/fence_ipmilan.xml
+++ b/tests/data/metadata/fence_ipmilan.xml
@@ -6,7 +6,7 @@
@ -1418,12 +1519,12 @@ index daad65a70..f7b6d0cee 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_ipmilanplus.xml b/tests/data/metadata/fence_ipmilanplus.xml
index 7b678b245..0835dd3a9 100644
index 7b678b245..146d05a70 100644
--- a/tests/data/metadata/fence_ipmilanplus.xml
+++ b/tests/data/metadata/fence_ipmilanplus.xml
@@ -6,7 +6,7 @@
@ -1431,7 +1532,7 @@ index 7b678b245..0835dd3a9 100644
<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
-<longdesc>fence_ipmilan is an I/O Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilan is an Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
+<longdesc>fence_ipmilanplus is a Power Fencing agent which can be used with machines controlled by IPMI. This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
@ -1508,13 +1609,14 @@ index 262956dca..b36fab96e 100644
When used as a watchdog device you can define e.g. retry=1, retry-sleep=2 and verbose=yes parameters in /etc/sysconfig/stonith if you have issues with it failing.</longdesc>
diff --git a/tests/data/metadata/fence_netio.xml b/tests/data/metadata/fence_netio.xml
index 95f3cf34a..59c030f09 100644
index 95f3cf34a..c1486c955 100644
--- a/tests/data/metadata/fence_netio.xml
+++ b/tests/data/metadata/fence_netio.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_netio" shortdesc="I/O Fencing agent for Koukaam NETIO-230B" >
-<resource-agent name="fence_netio" shortdesc="I/O Fencing agent for Koukaam NETIO-230B" >
-<longdesc>fence_netio is an I/O Fencing agent which can be used with the Koukaam NETIO-230B Power Distribution Unit. It logs into device via telnet and reboots a specified outlet. Lengthy telnet connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
+<resource-agent name="fence_netio" shortdesc="Power Fencing agent for Koukaam NETIO-230B" >
+<longdesc>fence_netio is a Power Fencing agent which can be used with the Koukaam NETIO-230B Power Distribution Unit. It logs into device via telnet and reboots a specified outlet. Lengthy telnet connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
<vendor-url>http://www.koukaam.se/</vendor-url>
<parameters>
@ -1568,13 +1670,14 @@ index 1ed3cda4f..1aeebfe3f 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_raritan.xml b/tests/data/metadata/fence_raritan.xml
index 5e387c784..ebc556084 100644
index 5e387c784..00bfadb7a 100644
--- a/tests/data/metadata/fence_raritan.xml
+++ b/tests/data/metadata/fence_raritan.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_raritan" shortdesc="I/O Fencing agent for Raritan Dominion PX" >
-<resource-agent name="fence_raritan" shortdesc="I/O Fencing agent for Raritan Dominion PX" >
-<longdesc>fence_raritan is an I/O Fencing agent which can be used with the Raritan DPXS12-20 Power Distribution Unit. It logs into device via telnet and reboots a specified outlet. Lengthy telnet connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
+<resource-agent name="fence_raritan" shortdesc="Power Fencing agent for Raritan Dominion PX" >
+<longdesc>fence_raritan is a Power Fencing agent which can be used with the Raritan DPXS12-20 Power Distribution Unit. It logs into device via telnet and reboots a specified outlet. Lengthy telnet connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
<vendor-url>http://www.raritan.com/</vendor-url>
<parameters>
@ -1592,13 +1695,14 @@ index c14d342f7..030696efe 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml
index 76a23af30..6d02b0139 100644
index 76a23af30..3285f77c4 100644
--- a/tests/data/metadata/fence_redfish.xml
+++ b/tests/data/metadata/fence_redfish.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_redfish" shortdesc="I/O Fencing agent for Redfish" >
-<resource-agent name="fence_redfish" shortdesc="I/O Fencing agent for Redfish" >
-<longdesc>fence_redfish is an I/O Fencing agent which can be used with Out-of-Band controllers that support Redfish APIs. These controllers provide remote access to control power on a server.</longdesc>
+<resource-agent name="fence_redfish" shortdesc="Power Fencing agent for Redfish" >
+<longdesc>fence_redfish is a Power Fencing agent which can be used with Out-of-Band controllers that support Redfish APIs. These controllers provide remote access to control power on a server.</longdesc>
<vendor-url>http://www.dmtf.org</vendor-url>
<parameters>
@ -1628,13 +1732,14 @@ index 284f9184d..8563d5005 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_rsb.xml b/tests/data/metadata/fence_rsb.xml
index e3d6e1096..92be88d99 100644
index e3d6e1096..ca42ff435 100644
--- a/tests/data/metadata/fence_rsb.xml
+++ b/tests/data/metadata/fence_rsb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_rsb" shortdesc="I/O Fencing agent for Fujitsu-Siemens RSB" >
-<resource-agent name="fence_rsb" shortdesc="I/O Fencing agent for Fujitsu-Siemens RSB" >
-<longdesc>fence_rsb is an I/O Fencing agent which can be used with the Fujitsu-Siemens RSB management interface. It logs into device via telnet/ssh and reboots a specified outlet. Lengthy telnet/ssh connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
+<resource-agent name="fence_rsb" shortdesc="Power Fencing agent for Fujitsu-Siemens RSB" >
+<longdesc>fence_rsb is a Power Fencing agent which can be used with the Fujitsu-Siemens RSB management interface. It logs into device via telnet/ssh and reboots a specified outlet. Lengthy telnet/ssh connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
<vendor-url>http://www.fujitsu.com</vendor-url>
<parameters>
@ -1651,6 +1756,18 @@ index d5600b7ce..82ded25b9 100644
<vendor-url></vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
index facb2f52e..b963fd772 100644
--- a/tests/data/metadata/fence_scsi.xml
+++ b/tests/data/metadata/fence_scsi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_scsi" shortdesc="Fence agent for SCSI persistent reservation" >
-<longdesc>fence_scsi is an I/O fencing agent that uses SCSI-3 persistent reservations to control access to shared storage devices. These devices must support SCSI-3 persistent reservations (SPC-3 or greater) as well as the "preempt-and-abort" subcommand.
+<longdesc>fence_scsi is an I/O Fencing agent that uses SCSI-3 persistent reservations to control access to shared storage devices. These devices must support SCSI-3 persistent reservations (SPC-3 or greater) as well as the "preempt-and-abort" subcommand.
The fence_scsi agent works by having each node in the cluster register a unique key with the SCSI device(s). Reservation key is generated from "node id" (default) or from "node name hash" (RECOMMENDED) by adjusting "key_value" option. Using hash is recommended to prevent issues when removing nodes from cluster without full cluster restart. Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_scsi agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.
When used as a watchdog device you can define e.g. retry=1, retry-sleep=2 and verbose=yes parameters in /etc/sysconfig/stonith if you have issues with it failing.</longdesc>
diff --git a/tests/data/metadata/fence_skalar.xml b/tests/data/metadata/fence_skalar.xml
index 84f3f4ea6..5ce022b32 100644
--- a/tests/data/metadata/fence_skalar.xml
@ -1664,7 +1781,7 @@ index 84f3f4ea6..5ce022b32 100644
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_tripplite_snmp.xml b/tests/data/metadata/fence_tripplite_snmp.xml
index c5f66d56f..aa392e69f 100644
index c5f66d56f..418832f9c 100644
--- a/tests/data/metadata/fence_tripplite_snmp.xml
+++ b/tests/data/metadata/fence_tripplite_snmp.xml
@@ -1,7 +1,7 @@
@ -1672,7 +1789,7 @@ index c5f66d56f..aa392e69f 100644
<resource-agent name="fence_tripplite_snmp" shortdesc="Fence agent for APC, Tripplite PDU over SNMP" >
<symlink name="fence_tripplite_snmp" shortdesc="Fence agent for Tripplife over SNMP"/>
-<longdesc>fence_apc_snmp is an I/O Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
+<longdesc>fence_apc_snmp is a Power Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
+<longdesc>fence_tripplite_snmp is a Power Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
<vendor-url>http://www.apc.com</vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
@ -1700,6 +1817,18 @@ index 82fe9b6d1..dc36693fc 100644
By default, virsh needs root account to do properly work. So you must allow ssh login in your sshd_config.</longdesc>
<vendor-url>http://libvirt.org</vendor-url>
diff --git a/tests/data/metadata/fence_virt.xml b/tests/data/metadata/fence_virt.xml
index 612d4d3cb..eec67ad8c 100644
--- a/tests/data/metadata/fence_virt.xml
+++ b/tests/data/metadata/fence_virt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_virt" shortdesc="Fence agent for virtual machines">
-<longdesc>fence_virt is an I/O Fencing agent which can be used with virtual machines.
+<longdesc>fence_virt is a Power Fencing agent which can be used with virtual machines.
NOTE: reboot-action does not power on nodes that are powered off.</longdesc>
<vendor-url>https://libvirt.org</vendor-url>
diff --git a/tests/data/metadata/fence_vmware.xml b/tests/data/metadata/fence_vmware.xml
index a46ffdb0f..a5fad2fd5 100644
--- a/tests/data/metadata/fence_vmware.xml
@ -1772,3 +1901,16 @@ index 380ac28da..c61d465f1 100644
<vendor-url>http://www.xenproject.org</vendor-url>
<parameters>
<parameter name="action" unique="0" required="1">
diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
index 96393bdfa..67104386e 100644
--- a/tests/data/metadata/fence_zvmip.xml
+++ b/tests/data/metadata/fence_zvmip.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" ?>
<resource-agent name="fence_zvmip" shortdesc="Fence agent for use with z/VM Virtual Machines" >
-<longdesc>The fence_zvmip agent is intended to be used with the
-z/VM SMAPI service via TCP/IP.
+<longdesc>fence_zvmip is a Power Fencing agent for z/VM SMAPI service via TCP/IP.
The z/VM SMAPI service must be configured so that the virtual machine running
the agent can connect to the service, access the system's directory manager,

159
RHEL-14344-fence_zvmip-document-user-permissions.patch Normal file
View File

@ -0,0 +1,159 @@
From dcb8ddd13c3dfad02e00c07f283251e0c2a60c46 Mon Sep 17 00:00:00 2001
From: Reid Wahl <nrwahl@protonmail.com>
Date: Mon, 16 Aug 2021 17:44:13 -0700
Subject: [PATCH] fence_zvmip: Update longdesc to document all required
functions
In RHBZ#1935641, IBM explained that the requesting user needs
authorization for more functions than what is currently documented.
They said:
"""
What we found is that you need rights from three different NICKS:
SERVER_MANAGEMENT, IMAGE_CHARACTERISTICS and IMAGE_OPERATIONS.
You won't be able to give a user all three NICKS.
Therefore, you have to create a new NICK with all capabilities from all
three NICKS together and then assign the new NICK to the USER
"ZCLUSTER".
Even better is to just use the needed Subset with a new NICK.
We found five commands which are used in the fencing code and on the
z/VM Log which should be enough for fencing to work.
We suggest creating following files:
File VSMWORK1 NAMELIST:
```
:nick.ZVM_FENCE
:list.
IMAGE_ACTIVATE
IMAGE_DEACTIVATE
IMAGE_STATUS_QUERY
CHECK_AUTHENTICATION
IMAGE_NAME_QUERY_DM
```
File VSMWORK1 AUTHLIST:
```
ZCLUSTER ALL ZVM_FENCE
```
For details, we suggest adding a link to the current z/VM docu:
- NAMELIST: https://www.ibm.com/support/knowledgecenter/de/SSB27U_7.2.0/com.ibm.zvm.v720.dmse6/namelst.htm
- AUTHLIST: https://www.ibm.com/support/knowledgecenter/de/SSB27U_7.2.0/com.ibm.zvm.v720.dmse6/auf.htm
"""
Resolves: RHBZ1935641
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
---
agents/zvm/fence_zvmip.py | 37 ++++++++++++++++++++++-------
tests/data/metadata/fence_zvmip.xml | 37 ++++++++++++++++++++++-------
2 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py
index 4f538e10d..c37950a20 100644
--- a/agents/zvm/fence_zvmip.py
+++ b/agents/zvm/fence_zvmip.py
@@ -199,21 +199,40 @@ def main():
docs = {}
docs["shortdesc"] = "Fence agent for use with z/VM Virtual Machines"
- docs["longdesc"] = """The fence_zvm agent is intended to be used with with z/VM SMAPI service via TCP/IP
+ docs["longdesc"] = """The fence_zvmip agent is intended to be used with the
+z/VM SMAPI service via TCP/IP.
-To use this agent the z/VM SMAPI service needs to be configured to allow the virtual machine running this agent to connect to it and issue
-the image_recycle operation. This involves updating the VSMWORK1 AUTHLIST VMSYS:VSMWORK1. file. The entry should look something similar to
-this:
+The z/VM SMAPI service must be configured so that the virtual machine running
+the agent can connect to the service, access the system's directory manager,
+and shortly thereafter run image_deactivate and image_activate. This involves
+updating the VSMWORK1 NAMELIST and VSMWORK1 AUTHLIST VMSYS:VSMWORK1 files.
+
+The NAMELIST entry assigns all the required functions to one nick and should
+look similar to this:
+
+:nick.ZVM_FENCE
+:list.
+IMAGE_ACTIVATE
+IMAGE_DEACTIVATE
+IMAGE_STATUS_QUERY
+CHECK_AUTHENTICATION
+IMAGE_NAME_QUERY_DM
+
+
+The AUTHLIST entry authorizes the user to perform all the functions associated
+with the nick, and should look similar to this:
Column 1 Column 66 Column 131
- | | |
- V V V
+| | |
+V V V
+
+XXXXXXXX ALL ZVM_FENCE
-XXXXXXXX ALL IMAGE_CHARACTERISTICS
+where XXXXXXXX is the name of the user in the authuser field of the request.
-Where XXXXXXX is the name of the virtual machine used in the authuser field of the request. This virtual machine also has to be authorized
-to access the system's directory manager.
+Refer to the official z/VM documentation for complete instructions and
+reference materials.
"""
docs["vendorurl"] = "http://www.ibm.com"
show_docs(options, docs)
diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
index 6996ab736..96393bdfa 100644
--- a/tests/data/metadata/fence_zvmip.xml
+++ b/tests/data/metadata/fence_zvmip.xml
@@ -1,20 +1,39 @@
<?xml version="1.0" ?>
<resource-agent name="fence_zvmip" shortdesc="Fence agent for use with z/VM Virtual Machines" >
-<longdesc>The fence_zvm agent is intended to be used with with z/VM SMAPI service via TCP/IP
+<longdesc>The fence_zvmip agent is intended to be used with the
+z/VM SMAPI service via TCP/IP.
-To use this agent the z/VM SMAPI service needs to be configured to allow the virtual machine running this agent to connect to it and issue
-the image_recycle operation. This involves updating the VSMWORK1 AUTHLIST VMSYS:VSMWORK1. file. The entry should look something similar to
-this:
+The z/VM SMAPI service must be configured so that the virtual machine running
+the agent can connect to the service, access the system's directory manager,
+and shortly thereafter run image_deactivate and image_activate. This involves
+updating the VSMWORK1 NAMELIST and VSMWORK1 AUTHLIST VMSYS:VSMWORK1 files.
+
+The NAMELIST entry assigns all the required functions to one nick and should
+look similar to this:
+
+:nick.ZVM_FENCE
+:list.
+IMAGE_ACTIVATE
+IMAGE_DEACTIVATE
+IMAGE_STATUS_QUERY
+CHECK_AUTHENTICATION
+IMAGE_NAME_QUERY_DM
+
+
+The AUTHLIST entry authorizes the user to perform all the functions associated
+with the nick, and should look similar to this:
Column 1 Column 66 Column 131
- | | |
- V V V
+| | |
+V V V
+
+XXXXXXXX ALL ZVM_FENCE
-XXXXXXXX ALL IMAGE_CHARACTERISTICS
+where XXXXXXXX is the name of the user in the authuser field of the request.
-Where XXXXXXX is the name of the virtual machine used in the authuser field of the request. This virtual machine also has to be authorized
-to access the system's directory manager.
+Refer to the official z/VM documentation for complete instructions and
+reference materials.
</longdesc>
<vendor-url>http://www.ibm.com</vendor-url>
<parameters>

10
fence-agents.spec
View File

@ -59,7 +59,7 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.10.0
Release: 58%{?alphatag:.%{alphatag}}%{?dist}
Release: 59%{?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
@ -238,7 +238,8 @@ Patch45: bz2221643-fence_ibm_powervs-performance-improvements.patch
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-14030-all-agents-metadata-update-IO-Power-Network.patch
Patch49: RHEL-14344-fence_zvmip-document-user-permissions.patch
Patch50: RHEL-14030-all-agents-metadata-update-IO-Power-Network.patch
### HA support libs/utils ###
# all archs
@ -407,6 +408,7 @@ BuildRequires: %{systemd_units}
%patch -p1 -P 47
%patch -p1 -P 48
%patch -p1 -P 49
%patch -p1 -P 50
# prevent compilation of something that won't get used anyway
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@ -1485,7 +1487,9 @@ are located on corosync cluster nodes.
%endif
%changelog
* Thu Oct 19 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-58
* 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
- all agents: update metadata in non-I/O agents to Power or Network
fencing
Resolves: RHEL-14030