From 729278dcb3b95851ac5e3d7b4972bbfb3ab1d924 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 24 2020 20:08:16 +0000 Subject: import fence-agents-4.2.1-55.el8 --- diff --git a/SOURCES/bz1818157-fence_azure_arm-fix-MSI-support.patch b/SOURCES/bz1818157-fence_azure_arm-fix-MSI-support.patch new file mode 100644 index 0000000..5e33400 --- /dev/null +++ b/SOURCES/bz1818157-fence_azure_arm-fix-MSI-support.patch @@ -0,0 +1,75 @@ +From 2c9ee29d1e28dbdd5e305156ae70451e31d976c0 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 4 Jun 2020 14:43:15 +0200 +Subject: [PATCH 1/2] fence_azure_arm: log metadata when debugging + +--- + lib/azure_fence.py.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/azure_fence.py.py b/lib/azure_fence.py.py +index 7bb43adc..4e44ca9d 100644 +--- a/lib/azure_fence.py.py ++++ b/lib/azure_fence.py.py +@@ -41,6 +41,7 @@ def get_from_metadata(parameter): + import requests + try: + r = requests.get('http://169.254.169.254/metadata/instance?api-version=2017-08-01', headers = {"Metadata":"true"}) ++ logging.debug("metadata: " + str(r.json())) + return str(r.json()["compute"][parameter]) + except: + logging.warning("Not able to use metadata service. Am I running in Azure?") + +From e3e3199cbf35855c6ab512ac06d7249df94eb3e7 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 4 Jun 2020 14:43:52 +0200 +Subject: [PATCH 2/2] fence_azure_arm: fixes to make MSI support work + +--- + agents/azure_arm/fence_azure_arm.py | 3 ++- + tests/data/metadata/fence_azure_arm.xml | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence_azure_arm.py +index be0d4034..6b1a3770 100755 +--- a/agents/azure_arm/fence_azure_arm.py ++++ b/agents/azure_arm/fence_azure_arm.py +@@ -184,7 +184,7 @@ def main(): + compute_client = None + network_client = None + +- device_opt = ["login", "passwd", "port", "resourceGroup", "tenantId", "subscriptionId", "network-fencing", "msi", "cloud"] ++ device_opt = ["login", "no_login", "no_password", "passwd", "port", "resourceGroup", "tenantId", "subscriptionId", "network-fencing", "msi", "cloud"] + + atexit.register(atexit_handler) + +@@ -222,6 +222,7 @@ def main(): + + try: + config = azure_fence.get_azure_config(options) ++ options["--resourceGroup"] = config.RGName + compute_client = azure_fence.get_azure_compute_client(config) + if "--network-fencing" in options: + network_client = azure_fence.get_azure_network_client(config) +diff --git a/tests/data/metadata/fence_azure_arm.xml b/tests/data/metadata/fence_azure_arm.xml +index 97ecfdba..7ea672af 100644 +--- a/tests/data/metadata/fence_azure_arm.xml ++++ b/tests/data/metadata/fence_azure_arm.xml +@@ -23,7 +23,7 @@ When using network fencing the reboot-action will cause a quick-return once the + + Fencing action + +- ++ + + + Application ID +@@ -58,7 +58,7 @@ When using network fencing the reboot-action will cause a quick-return once the + + Physical plug number on device, UUID or identification of machine + +- ++ + + + Application ID diff --git a/SOURCES/bz1851115-fence_mpath-support-comma-and-space-separated-devices.patch b/SOURCES/bz1851115-fence_mpath-support-comma-and-space-separated-devices.patch new file mode 100644 index 0000000..cd36647 --- /dev/null +++ b/SOURCES/bz1851115-fence_mpath-support-comma-and-space-separated-devices.patch @@ -0,0 +1,23 @@ +From 2d0057dabae0b4cd4394fec5a60a3f649c8e3d2b Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 1 Jul 2020 13:18:26 +0200 +Subject: [PATCH] fence_mpath: allow spaces for comma-separated devices and add + support for space-separated devices + +--- + agents/mpath/fence_mpath.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/mpath/fence_mpath.py b/agents/mpath/fence_mpath.py +index a3d9fe23..bc15aae2 100644 +--- a/agents/mpath/fence_mpath.py ++++ b/agents/mpath/fence_mpath.py +@@ -297,7 +297,7 @@ def main(): + if not ("--devices" in options and options["--devices"]): + fail_usage("Failed: No devices found") + +- options["devices"] = options["--devices"].split(",") ++ options["devices"] = [d for d in re.split("\s*,\s*|\s+", options["--devices"].strip()) if d] + # Input control END + + result = fence_action(None, options, set_status, get_status) diff --git a/SOURCES/bz1853973-fence_ipmilan-allow-increasing-ipmitool-verbosity.patch b/SOURCES/bz1853973-fence_ipmilan-allow-increasing-ipmitool-verbosity.patch new file mode 100644 index 0000000..28abff6 --- /dev/null +++ b/SOURCES/bz1853973-fence_ipmilan-allow-increasing-ipmitool-verbosity.patch @@ -0,0 +1,1489 @@ +From 3c377e48d96fbe80a5be5e9fd1a15c4b3a7d25e4 Mon Sep 17 00:00:00 2001 +From: Reid wahl +Date: Mon, 6 Jul 2020 03:58:42 -0700 +Subject: [PATCH 1/2] fencing: Add verbose_level option + +Currently, `verbose` is a boolean, all-or-nothing option. It would be +useful to be able to set more granular verbosity levels when debugging +an issue. + +This patch adds a `verbose_level` option to allow setting higher +verbosities. This option can be set explicitly (e.g., +`--verbose-level=3`). Alternatively, multiple `verbose` flags (e.g., +`-vvv`) can be passed on the command line; `verbose_level` is set to +the number of `-v` flags. + +If both an explicit `verbose_level` and one or more `-v` options are +set, the `verbose_level` takes precedence and overrides any `-v` flags. +If `verbose_level > 0` and there are no `-v` flags, the `verbose` +option is enabled implicitly. + +Later patches will enable individual fence agents to use the new +verbosity levels. + +Related to: RHBZ#1853973 +--- + lib/fencing.py.py | 58 ++++++++++++++++--- + tests/data/metadata/fence_aliyun.xml | 7 ++- + tests/data/metadata/fence_alom.xml | 7 ++- + tests/data/metadata/fence_amt.xml | 7 ++- + tests/data/metadata/fence_amt_ws.xml | 7 ++- + tests/data/metadata/fence_apc.xml | 7 ++- + tests/data/metadata/fence_apc_snmp.xml | 7 ++- + tests/data/metadata/fence_aws.xml | 7 ++- + tests/data/metadata/fence_azure_arm.xml | 7 ++- + tests/data/metadata/fence_bladecenter.xml | 7 ++- + tests/data/metadata/fence_brocade.xml | 7 ++- + tests/data/metadata/fence_cisco_mds.xml | 7 ++- + tests/data/metadata/fence_cisco_ucs.xml | 7 ++- + tests/data/metadata/fence_compute.xml | 7 ++- + tests/data/metadata/fence_docker.xml | 7 ++- + tests/data/metadata/fence_drac.xml | 7 ++- + tests/data/metadata/fence_drac5.xml | 7 ++- + tests/data/metadata/fence_dummy.xml | 7 ++- + tests/data/metadata/fence_eaton_snmp.xml | 7 ++- + tests/data/metadata/fence_emerson.xml | 7 ++- + tests/data/metadata/fence_eps.xml | 7 ++- + tests/data/metadata/fence_evacuate.xml | 7 ++- + tests/data/metadata/fence_gce.xml | 7 ++- + tests/data/metadata/fence_hds_cb.xml | 7 ++- + tests/data/metadata/fence_heuristics_ping.xml | 7 ++- + tests/data/metadata/fence_hpblade.xml | 7 ++- + tests/data/metadata/fence_ibmblade.xml | 7 ++- + tests/data/metadata/fence_idrac.xml | 7 ++- + tests/data/metadata/fence_ifmib.xml | 7 ++- + tests/data/metadata/fence_ilo.xml | 7 ++- + tests/data/metadata/fence_ilo2.xml | 7 ++- + tests/data/metadata/fence_ilo3.xml | 7 ++- + tests/data/metadata/fence_ilo3_ssh.xml | 7 ++- + tests/data/metadata/fence_ilo4.xml | 7 ++- + tests/data/metadata/fence_ilo4_ssh.xml | 7 ++- + tests/data/metadata/fence_ilo_moonshot.xml | 7 ++- + tests/data/metadata/fence_ilo_mp.xml | 7 ++- + tests/data/metadata/fence_ilo_ssh.xml | 7 ++- + tests/data/metadata/fence_imm.xml | 7 ++- + tests/data/metadata/fence_intelmodular.xml | 7 ++- + tests/data/metadata/fence_ipdu.xml | 7 ++- + tests/data/metadata/fence_ipmilan.xml | 7 ++- + tests/data/metadata/fence_ironic.xml | 7 ++- + tests/data/metadata/fence_ldom.xml | 7 ++- + tests/data/metadata/fence_lpar.xml | 7 ++- + tests/data/metadata/fence_mpath.xml | 7 ++- + tests/data/metadata/fence_netio.xml | 7 ++- + tests/data/metadata/fence_openstack.xml | 7 ++- + tests/data/metadata/fence_ovh.xml | 7 ++- + tests/data/metadata/fence_powerman.xml | 7 ++- + tests/data/metadata/fence_pve.xml | 7 ++- + tests/data/metadata/fence_raritan.xml | 7 ++- + tests/data/metadata/fence_rcd_serial.xml | 7 ++- + tests/data/metadata/fence_redfish.xml | 7 ++- + tests/data/metadata/fence_rhevm.xml | 7 ++- + tests/data/metadata/fence_rsa.xml | 7 ++- + tests/data/metadata/fence_rsb.xml | 7 ++- + tests/data/metadata/fence_sanbox2.xml | 7 ++- + tests/data/metadata/fence_sbd.xml | 7 ++- + tests/data/metadata/fence_scsi.xml | 7 ++- + tests/data/metadata/fence_tripplite_snmp.xml | 7 ++- + tests/data/metadata/fence_vbox.xml | 7 ++- + tests/data/metadata/fence_virsh.xml | 7 ++- + tests/data/metadata/fence_vmware.xml | 7 ++- + tests/data/metadata/fence_vmware_rest.xml | 7 ++- + tests/data/metadata/fence_vmware_soap.xml | 7 ++- + tests/data/metadata/fence_vmware_vcloud.xml | 7 ++- + tests/data/metadata/fence_wti.xml | 7 ++- + tests/data/metadata/fence_xenapi.xml | 7 ++- + tests/data/metadata/fence_zvmip.xml | 7 ++- + 73 files changed, 482 insertions(+), 80 deletions(-) + +diff --git a/lib/fencing.py.py b/lib/fencing.py.py +index 4b54aa7c..63b13036 100644 +--- a/lib/fencing.py.py ++++ b/lib/fencing.py.py +@@ -38,27 +38,40 @@ + "help" : "-h, --help Display this help and exit", + "required" : "0", + "shortdesc" : "Display help and exit", +- "order" : 54}, ++ "order" : 55}, + "version" : { + "getopt" : "V", + "longopt" : "version", + "help" : "-V, --version Display version information and exit", + "required" : "0", + "shortdesc" : "Display version information and exit", +- "order" : 53}, ++ "order" : 54}, + "verbose" : { + "getopt" : "v", + "longopt" : "verbose", +- "help" : "-v, --verbose Verbose mode", ++ "help" : "-v, --verbose Verbose mode. " ++ "Multiple -v flags can be stacked on the command line " ++ "(e.g., -vvv) to increase verbosity.", + "required" : "0", + "order" : 51}, ++ "verbose_level" : { ++ "getopt" : ":", ++ "longopt" : "verbose-level", ++ "type" : "integer", ++ "help" : "--verbose-level " ++ "Level of debugging detail in output. Defaults to the " ++ "number of --verbose flags specified on the command " ++ "line, or to 1 if verbose=1 in a stonith device " ++ "configuration (i.e., on stdin).", ++ "required" : "0", ++ "order" : 52}, + "debug" : { + "getopt" : "D:", + "longopt" : "debug-file", + "help" : "-D, --debug-file=[debugfile] Debugging to output file", + "required" : "0", + "shortdesc" : "Write debug information to given file", +- "order" : 52}, ++ "order" : 53}, + "delay" : { + "getopt" : ":", + "longopt" : "delay", +@@ -454,9 +467,10 @@ + + # options which are added automatically if 'key' is encountered ("default" is always added) + DEPENDENCY_OPT = { +- "default" : ["help", "debug", "verbose", "version", "action", "agent", \ +- "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", \ +- "delay", "quiet"], ++ "default" : ["help", "debug", "verbose", "verbose_level", ++ "version", "action", "agent", "power_timeout", ++ "shell_timeout", "login_timeout", "power_wait", ++ "retry_on", "delay", "quiet"], + "passwd" : ["passwd_script"], + "sudo" : ["sudo_path"], + "secure" : ["identity_file", "ssh_options", "ssh_path", "inet4_only", "inet6_only"], +@@ -683,6 +697,26 @@ def check_input(device_opt, opt, other_conditions = False): + if options["--action"] in ["metadata", "manpage"] or any(k in options for k in ("--help", "--version")): + return options + ++ try: ++ options["--verbose-level"] = int(options["--verbose-level"]) ++ except ValueError: ++ options["--verbose-level"] = -1 ++ ++ if options["--verbose-level"] < 0: ++ logging.warning("Parse error: Option 'verbose_level' must " ++ "be an integer greater than or equal to 0. " ++ "Setting verbose_level to 0.") ++ options["--verbose-level"] = 0 ++ ++ if options["--verbose-level"] == 0 and "--verbose" in options: ++ logging.warning("Parse error: Ignoring option 'verbose' " ++ "because it conflicts with verbose_level=0") ++ del options["--verbose"] ++ ++ if options["--verbose-level"] > 0: ++ # Ensure verbose key exists ++ options["--verbose"] = 1 ++ + if "--verbose" in options: + logging.getLogger().setLevel(logging.DEBUG) + +@@ -1409,6 +1443,9 @@ def _parse_input_stdin(avail_opt): + opt["--"+all_opt[name]["longopt"]] = "1" + else: + logging.warning("Parse error: Ignoring option '%s' because it does not have value\n", name) ++ ++ opt.setdefault("--verbose-level", opt.get("--verbose", 0)) ++ + return opt + + def _parse_input_cmdline(avail_opt): +@@ -1428,10 +1465,15 @@ def _parse_input_cmdline(avail_opt): + + # Short and long getopt names are changed to consistent "--" + long name (e.g. --username) + long_opts = {} +- for arg_name in list(dict(entered_opt).keys()): ++ verbose_count = 0 ++ for arg_name in [k for (k, v) in entered_opt]: + all_key = [key for (key, value) in list(filtered_opts.items()) \ + if "--" + value.get("longopt", "") == arg_name or "-" + value.get("getopt", "").rstrip(":") == arg_name][0] + long_opts["--" + filtered_opts[all_key]["longopt"]] = dict(entered_opt)[arg_name] ++ if all_key == "verbose": ++ verbose_count += 1 ++ ++ long_opts.setdefault("--verbose-level", verbose_count) + + # This test is specific because it does not apply to input on stdin + if "port_as_ip" in avail_opt and not "--port-as-ip" in long_opts and "--plug" in long_opts: +diff --git a/tests/data/metadata/fence_aliyun.xml b/tests/data/metadata/fence_aliyun.xml +index 2de3a8aa..8f236806 100644 +--- a/tests/data/metadata/fence_aliyun.xml ++++ b/tests/data/metadata/fence_aliyun.xml +@@ -46,7 +46,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_alom.xml b/tests/data/metadata/fence_alom.xml +index d6bb3d5b..ef6c06c3 100644 +--- a/tests/data/metadata/fence_alom.xml ++++ b/tests/data/metadata/fence_alom.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml +index 5f0adc98..ee174852 100644 +--- a/tests/data/metadata/fence_amt.xml ++++ b/tests/data/metadata/fence_amt.xml +@@ -80,7 +80,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_amt_ws.xml b/tests/data/metadata/fence_amt_ws.xml +index 86f36f6c..9c223c8d 100644 +--- a/tests/data/metadata/fence_amt_ws.xml ++++ b/tests/data/metadata/fence_amt_ws.xml +@@ -80,7 +80,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_apc.xml b/tests/data/metadata/fence_apc.xml +index 7330d8bc..efad9db8 100644 +--- a/tests/data/metadata/fence_apc.xml ++++ b/tests/data/metadata/fence_apc.xml +@@ -116,7 +116,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_apc_snmp.xml b/tests/data/metadata/fence_apc_snmp.xml +index 7f1c616c..a1947672 100644 +--- a/tests/data/metadata/fence_apc_snmp.xml ++++ b/tests/data/metadata/fence_apc_snmp.xml +@@ -121,7 +121,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_aws.xml b/tests/data/metadata/fence_aws.xml +index 12f67322..527fc86c 100644 +--- a/tests/data/metadata/fence_aws.xml ++++ b/tests/data/metadata/fence_aws.xml +@@ -49,7 +49,12 @@ For instructions see: https://boto3.readthedocs.io/en/latest/guide/quickstart.ht + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_azure_arm.xml b/tests/data/metadata/fence_azure_arm.xml +index 7ea672af..42c9952f 100644 +--- a/tests/data/metadata/fence_azure_arm.xml ++++ b/tests/data/metadata/fence_azure_arm.xml +@@ -106,7 +106,12 @@ When using network fencing the reboot-action will cause a quick-return once the + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_bladecenter.xml b/tests/data/metadata/fence_bladecenter.xml +index 0762e43f..f2ee28b1 100644 +--- a/tests/data/metadata/fence_bladecenter.xml ++++ b/tests/data/metadata/fence_bladecenter.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_brocade.xml b/tests/data/metadata/fence_brocade.xml +index ef2b9833..f3287503 100644 +--- a/tests/data/metadata/fence_brocade.xml ++++ b/tests/data/metadata/fence_brocade.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml +index 15d7798c..a0e62cba 100644 +--- a/tests/data/metadata/fence_cisco_mds.xml ++++ b/tests/data/metadata/fence_cisco_mds.xml +@@ -120,7 +120,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml +index 848e72f8..f4543f4b 100644 +--- a/tests/data/metadata/fence_cisco_ucs.xml ++++ b/tests/data/metadata/fence_cisco_ucs.xml +@@ -96,7 +96,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml +index 2f183268..a5ce53cd 100644 +--- a/tests/data/metadata/fence_compute.xml ++++ b/tests/data/metadata/fence_compute.xml +@@ -131,7 +131,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_docker.xml b/tests/data/metadata/fence_docker.xml +index 3285314c..6e3306d4 100644 +--- a/tests/data/metadata/fence_docker.xml ++++ b/tests/data/metadata/fence_docker.xml +@@ -84,7 +84,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_drac.xml b/tests/data/metadata/fence_drac.xml +index 2184ee0c..451ee504 100644 +--- a/tests/data/metadata/fence_drac.xml ++++ b/tests/data/metadata/fence_drac.xml +@@ -81,7 +81,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml +index 069f7b00..564008ab 100644 +--- a/tests/data/metadata/fence_drac5.xml ++++ b/tests/data/metadata/fence_drac5.xml +@@ -120,7 +120,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_dummy.xml b/tests/data/metadata/fence_dummy.xml +index 873c565b..ec4d5b46 100644 +--- a/tests/data/metadata/fence_dummy.xml ++++ b/tests/data/metadata/fence_dummy.xml +@@ -31,7 +31,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_eaton_snmp.xml b/tests/data/metadata/fence_eaton_snmp.xml +index 3dd92dd2..1ec07c68 100644 +--- a/tests/data/metadata/fence_eaton_snmp.xml ++++ b/tests/data/metadata/fence_eaton_snmp.xml +@@ -120,7 +120,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_emerson.xml b/tests/data/metadata/fence_emerson.xml +index f6886469..fbdcbcde 100644 +--- a/tests/data/metadata/fence_emerson.xml ++++ b/tests/data/metadata/fence_emerson.xml +@@ -120,7 +120,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_eps.xml b/tests/data/metadata/fence_eps.xml +index 26e75477..47cad6f0 100644 +--- a/tests/data/metadata/fence_eps.xml ++++ b/tests/data/metadata/fence_eps.xml +@@ -83,7 +83,12 @@ Agent basically works by connecting to hidden page and pass appropriate argument + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_evacuate.xml b/tests/data/metadata/fence_evacuate.xml +index 95da0e1b..f32b48eb 100644 +--- a/tests/data/metadata/fence_evacuate.xml ++++ b/tests/data/metadata/fence_evacuate.xml +@@ -126,7 +126,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml +index 79b82ebb..3b8a24a4 100644 +--- a/tests/data/metadata/fence_gce.xml ++++ b/tests/data/metadata/fence_gce.xml +@@ -56,7 +56,12 @@ For instructions see: https://cloud.google.com/compute/docs/tutorials/python-gui + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_hds_cb.xml b/tests/data/metadata/fence_hds_cb.xml +index 71cfd8ed..5529472d 100644 +--- a/tests/data/metadata/fence_hds_cb.xml ++++ b/tests/data/metadata/fence_hds_cb.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_heuristics_ping.xml b/tests/data/metadata/fence_heuristics_ping.xml +index 3dbceeb2..53e3bb05 100644 +--- a/tests/data/metadata/fence_heuristics_ping.xml ++++ b/tests/data/metadata/fence_heuristics_ping.xml +@@ -56,7 +56,12 @@ This is not a fence agent by itself! Its only purpose is to enable/disable anoth + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_hpblade.xml b/tests/data/metadata/fence_hpblade.xml +index 6cdc73ed..bbb51668 100644 +--- a/tests/data/metadata/fence_hpblade.xml ++++ b/tests/data/metadata/fence_hpblade.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ibmblade.xml b/tests/data/metadata/fence_ibmblade.xml +index 5084b3a0..6585c4fb 100644 +--- a/tests/data/metadata/fence_ibmblade.xml ++++ b/tests/data/metadata/fence_ibmblade.xml +@@ -120,7 +120,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml +index 55d9ced3..efecc720 100644 +--- a/tests/data/metadata/fence_idrac.xml ++++ b/tests/data/metadata/fence_idrac.xml +@@ -123,7 +123,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ifmib.xml b/tests/data/metadata/fence_ifmib.xml +index c07a6e1f..93bd8aa3 100644 +--- a/tests/data/metadata/fence_ifmib.xml ++++ b/tests/data/metadata/fence_ifmib.xml +@@ -122,7 +122,12 @@ It was written with managed ethernet switches in mind, in order to fence iSCSI S + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo.xml b/tests/data/metadata/fence_ilo.xml +index 44b3c43a..7ed91061 100644 +--- a/tests/data/metadata/fence_ilo.xml ++++ b/tests/data/metadata/fence_ilo.xml +@@ -107,7 +107,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo2.xml b/tests/data/metadata/fence_ilo2.xml +index e9cae6d2..5527cf21 100644 +--- a/tests/data/metadata/fence_ilo2.xml ++++ b/tests/data/metadata/fence_ilo2.xml +@@ -107,7 +107,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml +index 2a99e0a4..b5db044c 100644 +--- a/tests/data/metadata/fence_ilo3.xml ++++ b/tests/data/metadata/fence_ilo3.xml +@@ -123,7 +123,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo3_ssh.xml b/tests/data/metadata/fence_ilo3_ssh.xml +index e46d607c..a3c8f11c 100644 +--- a/tests/data/metadata/fence_ilo3_ssh.xml ++++ b/tests/data/metadata/fence_ilo3_ssh.xml +@@ -124,7 +124,12 @@ WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent t + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml +index 68790266..210b05d2 100644 +--- a/tests/data/metadata/fence_ilo4.xml ++++ b/tests/data/metadata/fence_ilo4.xml +@@ -123,7 +123,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo4_ssh.xml b/tests/data/metadata/fence_ilo4_ssh.xml +index a2c4614a..9b993dd5 100644 +--- a/tests/data/metadata/fence_ilo4_ssh.xml ++++ b/tests/data/metadata/fence_ilo4_ssh.xml +@@ -124,7 +124,12 @@ WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent t + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo_moonshot.xml b/tests/data/metadata/fence_ilo_moonshot.xml +index 00e43840..1e31424a 100644 +--- a/tests/data/metadata/fence_ilo_moonshot.xml ++++ b/tests/data/metadata/fence_ilo_moonshot.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo_mp.xml b/tests/data/metadata/fence_ilo_mp.xml +index 2bba33dc..b825cd32 100644 +--- a/tests/data/metadata/fence_ilo_mp.xml ++++ b/tests/data/metadata/fence_ilo_mp.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ilo_ssh.xml b/tests/data/metadata/fence_ilo_ssh.xml +index 1c8145b8..df87fd5f 100644 +--- a/tests/data/metadata/fence_ilo_ssh.xml ++++ b/tests/data/metadata/fence_ilo_ssh.xml +@@ -124,7 +124,12 @@ WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent t + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml +index e22e4723..d00ad7fa 100644 +--- a/tests/data/metadata/fence_imm.xml ++++ b/tests/data/metadata/fence_imm.xml +@@ -123,7 +123,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_intelmodular.xml b/tests/data/metadata/fence_intelmodular.xml +index 5e0d3b19..ed5afcb8 100644 +--- a/tests/data/metadata/fence_intelmodular.xml ++++ b/tests/data/metadata/fence_intelmodular.xml +@@ -122,7 +122,12 @@ Note: Since firmware update version 2.7, SNMP v2 write support is removed, and r + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ipdu.xml b/tests/data/metadata/fence_ipdu.xml +index 546e372c..78575c7c 100644 +--- a/tests/data/metadata/fence_ipdu.xml ++++ b/tests/data/metadata/fence_ipdu.xml +@@ -120,7 +120,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml +index 3e13d288..d4c23f73 100644 +--- a/tests/data/metadata/fence_ipmilan.xml ++++ b/tests/data/metadata/fence_ipmilan.xml +@@ -123,7 +123,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ironic.xml b/tests/data/metadata/fence_ironic.xml +index 5775f285..84beaffc 100644 +--- a/tests/data/metadata/fence_ironic.xml ++++ b/tests/data/metadata/fence_ironic.xml +@@ -76,7 +76,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ldom.xml b/tests/data/metadata/fence_ldom.xml +index b3c53458..4bb38571 100644 +--- a/tests/data/metadata/fence_ldom.xml ++++ b/tests/data/metadata/fence_ldom.xml +@@ -113,7 +113,12 @@ Very useful parameter is -c (or cmd_prompt in stdin mode). This must be set to s + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_lpar.xml b/tests/data/metadata/fence_lpar.xml +index 16d43a78..7ddc2c45 100644 +--- a/tests/data/metadata/fence_lpar.xml ++++ b/tests/data/metadata/fence_lpar.xml +@@ -125,7 +125,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_mpath.xml b/tests/data/metadata/fence_mpath.xml +index f5e60823..83d69f6c 100644 +--- a/tests/data/metadata/fence_mpath.xml ++++ b/tests/data/metadata/fence_mpath.xml +@@ -37,7 +37,12 @@ The fence_mpath agent works by having a unique key for each node that has to be + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_netio.xml b/tests/data/metadata/fence_netio.xml +index 79d27af3..b409bde7 100644 +--- a/tests/data/metadata/fence_netio.xml ++++ b/tests/data/metadata/fence_netio.xml +@@ -71,7 +71,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml +index 22517657..645cd655 100644 +--- a/tests/data/metadata/fence_openstack.xml ++++ b/tests/data/metadata/fence_openstack.xml +@@ -101,7 +101,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_ovh.xml b/tests/data/metadata/fence_ovh.xml +index b2767cc0..e8160bf7 100644 +--- a/tests/data/metadata/fence_ovh.xml ++++ b/tests/data/metadata/fence_ovh.xml +@@ -61,7 +61,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_powerman.xml b/tests/data/metadata/fence_powerman.xml +index ce72e002..3bf56882 100644 +--- a/tests/data/metadata/fence_powerman.xml ++++ b/tests/data/metadata/fence_powerman.xml +@@ -41,7 +41,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_pve.xml b/tests/data/metadata/fence_pve.xml +index 5d744903..1c83f2ef 100644 +--- a/tests/data/metadata/fence_pve.xml ++++ b/tests/data/metadata/fence_pve.xml +@@ -94,7 +94,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_raritan.xml b/tests/data/metadata/fence_raritan.xml +index 565eebc7..537cb141 100644 +--- a/tests/data/metadata/fence_raritan.xml ++++ b/tests/data/metadata/fence_raritan.xml +@@ -71,7 +71,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_rcd_serial.xml b/tests/data/metadata/fence_rcd_serial.xml +index c22f78de..b2a20cb7 100644 +--- a/tests/data/metadata/fence_rcd_serial.xml ++++ b/tests/data/metadata/fence_rcd_serial.xml +@@ -29,7 +29,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml +index 91b483b7..32ea402e 100644 +--- a/tests/data/metadata/fence_redfish.xml ++++ b/tests/data/metadata/fence_redfish.xml +@@ -106,7 +106,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml +index 73c9906f..deb326c3 100644 +--- a/tests/data/metadata/fence_rhevm.xml ++++ b/tests/data/metadata/fence_rhevm.xml +@@ -115,7 +115,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_rsa.xml b/tests/data/metadata/fence_rsa.xml +index f9a55f82..51009427 100644 +--- a/tests/data/metadata/fence_rsa.xml ++++ b/tests/data/metadata/fence_rsa.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_rsb.xml b/tests/data/metadata/fence_rsb.xml +index 022835be..7d8575d1 100644 +--- a/tests/data/metadata/fence_rsb.xml ++++ b/tests/data/metadata/fence_rsb.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_sanbox2.xml b/tests/data/metadata/fence_sanbox2.xml +index 7e20c8ce..bf07f360 100644 +--- a/tests/data/metadata/fence_sanbox2.xml ++++ b/tests/data/metadata/fence_sanbox2.xml +@@ -81,7 +81,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_sbd.xml b/tests/data/metadata/fence_sbd.xml +index 6095a74b..db52b49a 100644 +--- a/tests/data/metadata/fence_sbd.xml ++++ b/tests/data/metadata/fence_sbd.xml +@@ -39,7 +39,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml +index d0818b0d..ceb79de5 100644 +--- a/tests/data/metadata/fence_scsi.xml ++++ b/tests/data/metadata/fence_scsi.xml +@@ -54,7 +54,12 @@ When used as a watchdog device you can define e.g. retry=1, retry-sleep=2 and ve + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_tripplite_snmp.xml b/tests/data/metadata/fence_tripplite_snmp.xml +index d3769133..becc0d18 100644 +--- a/tests/data/metadata/fence_tripplite_snmp.xml ++++ b/tests/data/metadata/fence_tripplite_snmp.xml +@@ -121,7 +121,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_vbox.xml b/tests/data/metadata/fence_vbox.xml +index 3b53c7d2..045fbe9e 100644 +--- a/tests/data/metadata/fence_vbox.xml ++++ b/tests/data/metadata/fence_vbox.xml +@@ -113,7 +113,12 @@ By default, vbox needs to log in as a user that is a member of the vboxusers gro + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_virsh.xml b/tests/data/metadata/fence_virsh.xml +index 864986d0..2ab09c33 100644 +--- a/tests/data/metadata/fence_virsh.xml ++++ b/tests/data/metadata/fence_virsh.xml +@@ -113,7 +113,12 @@ By default, virsh needs root account to do properly work. So you must allow ssh + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_vmware.xml b/tests/data/metadata/fence_vmware.xml +index 48fc408b..14b504ed 100644 +--- a/tests/data/metadata/fence_vmware.xml ++++ b/tests/data/metadata/fence_vmware.xml +@@ -124,7 +124,12 @@ After you have successfully installed VI Perl Toolkit or VIX API, you should be + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_vmware_rest.xml b/tests/data/metadata/fence_vmware_rest.xml +index 830b6a21..41b09ba2 100644 +--- a/tests/data/metadata/fence_vmware_rest.xml ++++ b/tests/data/metadata/fence_vmware_rest.xml +@@ -102,7 +102,12 @@ NOTE: If there's more than 1000 VMs there is a filter parameter to work around t + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml +index da6a1002..ee385adf 100644 +--- a/tests/data/metadata/fence_vmware_soap.xml ++++ b/tests/data/metadata/fence_vmware_soap.xml +@@ -93,7 +93,12 @@ Name of virtual machine (-n / port) has to be used in inventory path format (e.g + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_vmware_vcloud.xml b/tests/data/metadata/fence_vmware_vcloud.xml +index 505eaf2b..21c9b77d 100644 +--- a/tests/data/metadata/fence_vmware_vcloud.xml ++++ b/tests/data/metadata/fence_vmware_vcloud.xml +@@ -95,7 +95,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_wti.xml b/tests/data/metadata/fence_wti.xml +index 872e4a90..8064b703 100644 +--- a/tests/data/metadata/fence_wti.xml ++++ b/tests/data/metadata/fence_wti.xml +@@ -111,7 +111,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_xenapi.xml b/tests/data/metadata/fence_xenapi.xml +index f6f4e46d..a1694ec5 100644 +--- a/tests/data/metadata/fence_xenapi.xml ++++ b/tests/data/metadata/fence_xenapi.xml +@@ -61,7 +61,12 @@ + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + +diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml +index 408ad977..95c2ded3 100644 +--- a/tests/data/metadata/fence_zvmip.xml ++++ b/tests/data/metadata/fence_zvmip.xml +@@ -104,7 +104,12 @@ to access the system's directory manager. + + + +- Verbose mode ++ Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity. ++ ++ ++ ++ ++ Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin). + + + + +From 60544f8642c483fce74d3c146d29c3c1a8bdd021 Mon Sep 17 00:00:00 2001 +From: Reid wahl +Date: Thu, 9 Jul 2020 22:17:15 -0700 +Subject: [PATCH 2/2] fence_ipmilan: Add ability to increase ipmitool verbosity + +Currently, the `-v` flag only causes the `ipmitool` command line and +output to be printed. + +This patch allows `fence_ipmilan` to accept additional `-v` flags and +pass them on to `ipmitool` to get more verbosity. + +Depends on: PR#346 +Resolves: RHBZ#1853973 +--- + agents/ipmilan/fence_ipmilan.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/agents/ipmilan/fence_ipmilan.py b/agents/ipmilan/fence_ipmilan.py +index ecd35582..ee014e79 100644 +--- a/agents/ipmilan/fence_ipmilan.py ++++ b/agents/ipmilan/fence_ipmilan.py +@@ -92,6 +92,10 @@ def append(cls, cmd, log=None): + # --action / -o + Cmd.append(" chassis power " + action) + ++ # --verbose-level ++ if options["--verbose-level"] > 1: ++ Cmd.append(" -" + "v" * (options["--verbose-level"] - 1)) ++ + return (Cmd.cmd, Cmd.log) + + def define_new_opts(): diff --git a/SOURCES/bz1861926-fence_lpar-fix-list-status-action.patch b/SOURCES/bz1861926-fence_lpar-fix-list-status-action.patch new file mode 100644 index 0000000..5842f73 --- /dev/null +++ b/SOURCES/bz1861926-fence_lpar-fix-list-status-action.patch @@ -0,0 +1,145 @@ +From 6d0b2cb598135b697ee583e3514aa427fc0e4cf8 Mon Sep 17 00:00:00 2001 +From: Reid Wahl +Date: Wed, 29 Jul 2020 18:33:17 -0700 +Subject: [PATCH 1/2] fence_lpar: Fix list-status action + +The `list-status` action prints "UNKNOWN" status for all LPARs when +`--hmc-version` is `"4"` or `"IVM"`. + +This commit fixes that by mapping the statuses returned by the HMC +(e.g., "Running") to the statuses that the fencing library expects +(e.g., "on"). + +Resolves: RHBZ#1861926 + +Signed-off-by: Reid Wahl +--- + agents/lpar/fence_lpar.py | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +diff --git a/agents/lpar/fence_lpar.py b/agents/lpar/fence_lpar.py +index 9dfabc43..03068466 100644 +--- a/agents/lpar/fence_lpar.py ++++ b/agents/lpar/fence_lpar.py +@@ -16,6 +16,16 @@ + from fencing import * + from fencing import fail, fail_usage, EC_STATUS_HMC + ++## ++## Transformation to standard ON/OFF status if possible ++def _normalize_status(status): ++ if status in ["Running", "Open Firmware", "Shutting Down", "Starting"]: ++ status = "on" ++ else: ++ status = "off" ++ ++ return status ++ + def get_power_status(conn, options): + if options["--hmc-version"] == "3": + conn.send("lssyscfg -r lpar -m " + options["--managed"] + " -n " + options["--plug"] + " -F name,state\n") +@@ -42,14 +52,7 @@ def get_power_status(conn, options): + except AttributeError: + fail(EC_STATUS_HMC) + +- ## +- ## Transformation to standard ON/OFF status if possible +- if status in ["Running", "Open Firmware", "Shutting Down", "Starting"]: +- status = "on" +- else: +- status = "off" +- +- return status ++ return _normalize_status(status) + + def set_power_status(conn, options): + if options["--hmc-version"] == "3": +@@ -111,10 +114,10 @@ def get_lpar_list(conn, options): + lines = res.group(1).split("\n") + for outlet_line in lines: + try: +- (port, status) = outlet_line.split(":") ++ (port, status) = outlet_line.rstrip().split(":") + except ValueError: + fail_usage('Output does not match expected HMC version, try different one'); +- outlets[port] = ("", status) ++ outlets[port] = ("", _normalize_status(status)) + elif options["--hmc-version"] == "IVM": + conn.send("lssyscfg -r lpar -m " + options["--managed"] + + " -F name,state\n") +@@ -133,10 +136,10 @@ def get_lpar_list(conn, options): + lines = res.group(1).split("\n") + for outlet_line in lines: + try: +- (port, status) = outlet_line.split(",") ++ (port, status) = outlet_line.rstrip().split(",") + except ValueError: + fail_usage('Output does not match expected HMC version, try different one'); +- outlets[port] = ("", status) ++ outlets[port] = ("", _normalize_status(status)) + + return outlets + + +From 4f7b40c0cde896f2f5b09e796ba34450e90aee6c Mon Sep 17 00:00:00 2001 +From: Reid Wahl +Date: Wed, 29 Jul 2020 18:43:47 -0700 +Subject: [PATCH 2/2] fence_lpar: Reduce code duplication in get_lpar_list + +The logic for HMC version 4 and HMC version IVM are the same except for +the use of a different separator character. This commit condenses them +into one block. + +Signed-off-by: Reid Wahl +--- + agents/lpar/fence_lpar.py | 28 ++++------------------------ + 1 file changed, 4 insertions(+), 24 deletions(-) + +diff --git a/agents/lpar/fence_lpar.py b/agents/lpar/fence_lpar.py +index 03068466..7560a82c 100644 +--- a/agents/lpar/fence_lpar.py ++++ b/agents/lpar/fence_lpar.py +@@ -96,31 +96,11 @@ def get_lpar_list(conn, options): + lines = res.group(2).split("\n") + for outlet_line in lines: + outlets[outlet_line.rstrip()] = ("", "") +- elif options["--hmc-version"] == "4": +- conn.send("lssyscfg -r lpar -m " + options["--managed"] + +- " -F name:state\n") +- +- ## We have to remove first line (command) +- conn.readline() +- conn.log_expect(options["--command-prompt"], int(options["--power-timeout"])) +- +- ## We have to remove last line (part of new prompt) +- #### +- res = re.search("^(.*)\n.*$", conn.before, re.S) +- +- if res == None: +- fail_usage("Unable to parse output of list command") ++ elif options["--hmc-version"] in ["4", "IVM"]: ++ sep = ":" if options["--hmc-version"] == "4" else "," + +- lines = res.group(1).split("\n") +- for outlet_line in lines: +- try: +- (port, status) = outlet_line.rstrip().split(":") +- except ValueError: +- fail_usage('Output does not match expected HMC version, try different one'); +- outlets[port] = ("", _normalize_status(status)) +- elif options["--hmc-version"] == "IVM": + conn.send("lssyscfg -r lpar -m " + options["--managed"] + +- " -F name,state\n") ++ " -F name" + sep + "state\n") + + ## We have to remove first line (command) + conn.readline() +@@ -136,7 +116,7 @@ def get_lpar_list(conn, options): + lines = res.group(1).split("\n") + for outlet_line in lines: + try: +- (port, status) = outlet_line.rstrip().split(",") ++ (port, status) = outlet_line.rstrip().split(sep) + except ValueError: + fail_usage('Output does not match expected HMC version, try different one'); + outlets[port] = ("", _normalize_status(status)) diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index 799fb15..9eab001 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: 53%{?alphatag:.%{alphatag}}%{?dist} +Release: 55%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -110,9 +110,13 @@ Patch68: bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch Patch69: bz1793739-fence_vmware_rest-3-fix-encode-issue.patch Patch70: bz1860544-fence_lpar-fix-long-user-host-issue.patch Patch71: bz1859932-fence_evacuate-support-private-flavors.patch +Patch72: bz1818157-fence_azure_arm-fix-MSI-support.patch +Patch73: bz1851115-fence_mpath-support-comma-and-space-separated-devices.patch +Patch74: bz1853973-fence_ipmilan-allow-increasing-ipmitool-verbosity.patch +Patch75: bz1861926-fence_lpar-fix-list-status-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 @@ -259,6 +263,10 @@ BuildRequires: python3-google-api-client %patch69 -p1 %patch70 -p1 %patch71 -p1 +%patch72 -p1 +%patch73 -p1 +%patch74 -p1 +%patch75 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -456,7 +464,14 @@ The fence-agents-amt-ws package contains a fence agent for AMT (WS-Man) devices. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for APC devices -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -518,7 +533,14 @@ Fence agent for Azure Resource Manager instances. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for IBM BladeCenter -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -533,7 +555,14 @@ via telnet or SSH. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for Brocade switches -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -593,7 +622,14 @@ Fence agent for Nova compute nodes. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for Dell DRAC 5 -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -663,6 +699,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 @@ -681,7 +736,14 @@ ping-heuristics. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for HP BladeSystem devices -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -743,7 +805,14 @@ the HTTP(s) protocol. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for HP iLO Moonshot devices -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -758,7 +827,15 @@ via telnet or SSH. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for HP iLO MP devices -Requires: telnet openssh-clients +Requires: openssh-clients +%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} Requires: fence-agents-common >= %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} BuildArch: noarch @@ -861,7 +938,14 @@ Fence agent for use with kdump crash recovery service. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for IBM LPAR -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -919,7 +1003,14 @@ Fence agent for RHEV-M via REST API. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for IBM RSA II -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -935,7 +1026,14 @@ via telnet or SSH. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for Fujitsu RSB -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -1023,7 +1121,14 @@ Fence agent for VMWare with SOAP API v4.1+. License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for WTI Network power switches -Requires: telnet openssh-clients +Requires: openssh-clients +%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 @@ -1050,15 +1155,30 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Tue Sep 15 2020 Oyvind Albrigtsen - 4.2.1-55 +- fence_hds_cb: new fence agent + Resolves: rhbz#1726874 + +* Mon Sep 14 2020 Oyvind Albrigtsen - 4.2.1-54 +- fence_azure_arm: fix MSI support + Resolves: rhbz#1818157 +- fence_mpath: allow spaces for comma-separated devices and add + support for space-separated devices + Resolves: rhbz#1851115 +- fence_ipmilan: add ability to increase ipmitool verbosity + Resolves: rhbz#1853973 +- fence_lpar: fix list-status action + Resolves: rhbz#1861926 +- all agents: make telnet a weak dependency + Resolves: rhbz#1851232 + * Fri Aug 7 2020 Oyvind Albrigtsen - 4.2.1-53 - fence_evacuate: enable evacuation of instances using private flavors - Resolves: rhbz#1859932 * Tue Jul 28 2020 Oyvind Albrigtsen - 4.2.1-52 - fence_lpar: fix issue with long username, hostname, etc not working when the command run by the agent exceeds 80 characters - Resolves: rhbz#1860544 * Thu Jul 2 2020 Oyvind Albrigtsen - 4.2.1-51