diff --git a/bz2149655-fence_virtd-update-fence_virt.conf-manpage.patch b/bz2149655-fence_virtd-update-fence_virt.conf-manpage.patch new file mode 100644 index 0000000..8633a5f --- /dev/null +++ b/bz2149655-fence_virtd-update-fence_virt.conf-manpage.patch @@ -0,0 +1,55 @@ +From 6f213eb637bf7d957ba035e3aa09ce1f1bbccf84 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 29 Nov 2022 16:21:18 +0100 +Subject: [PATCH] fence_virtd: add info about using multiple uuid/ip entries + for groups + +--- + agents/virt/man/fence_virt.conf.5 | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/agents/virt/man/fence_virt.conf.5 b/agents/virt/man/fence_virt.conf.5 +index c8434ed65..dfb3504f5 100644 +--- a/agents/virt/man/fence_virt.conf.5 ++++ b/agents/virt/man/fence_virt.conf.5 +@@ -1,4 +1,4 @@ +-.TH fence_virtd.conf 5 ++.TH fence_virt.conf 5 + + .SH NAME + fence_virt.conf - configuration file for fence_virtd +@@ -304,15 +304,17 @@ This defines a group. + .TP + .B uuid + . +-defines UUID as a member of a group. ++Defines UUID as a member of a group. It can be used multiple times ++to specify both node name and UUID values that can be fenced. + + .TP + .B ip + . +-defines an IP which is allowed to send fencing requests +-for members of this group (e.g. for multicast). It is +-highly recommended that this be used in conjunction with +-a key file. ++Defines an IP which is allowed to send fencing requests ++for members of this group (e.g. for multicast). It can be used ++multiple times to allow more than 1 IP to send fencing requests to ++the group. It is highly recommended that this be used in conjunction ++with a key file. + + + +@@ -340,8 +342,11 @@ a key file. + groups { + group { + ip = "192.168.1.1"; ++ ip = "192.168.1.2"; + uuid = "44179d3f-6c63-474f-a212-20c8b4b25b16"; + uuid = "1ce02c4b-dfa1-42cb-b5b1-f0b1091ece60"; ++ uuid = "node1"; ++ uuid = "node2"; + } + } + diff --git a/fence-agents.spec b/fence-agents.spec index bc1a2ce..ca66f3c 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -60,7 +60,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 39%{?alphatag:.%{alphatag}}%{?dist} +Release: 40%{?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 @@ -227,6 +227,7 @@ Patch32: bz2134015-fence_lpar-only-output-additional-info-on-debug.patch Patch33: bz2136191-fence_ibm_powervs-improve-defaults.patch Patch34: bz2138823-fence_virtd-update-manpage.patch Patch35: bz2144531-fence_virtd-warn-files-not-mode-600.patch +Patch36: bz2149655-fence_virtd-update-fence_virt.conf-manpage.patch %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti %ifarch x86_64 @@ -373,6 +374,7 @@ BuildRequires: %{systemd_units} %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1439,10 +1441,15 @@ are located on corosync cluster nodes. %endif %changelog +* Fri Dec 2 2022 Oyvind Albrigtsen - 4.10.0-40 +- fence_virtd: add info about multiple uuid/ip entries to manpage + + Resolves: rhbz#2149655 + * Tue Nov 22 2022 Oyvind Albrigtsen - 4.10.0-39 - fence_virtd: warn if config or key file(s) are not mode 600 - Resolves: rhbz#bz2144531 + Resolves: rhbz#2144531 * Fri Nov 11 2022 Oyvind Albrigtsen - 4.10.0-38 - fence_vmware_soap: set timeout, which should help cleanup tmp dirs