From 5249461e2babaa86af491e12fceee0f25379fe63 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 5 Oct 2022 09:36:41 +0200 Subject: [PATCH] - fence_virt: add note that reboot-action doesnt power on nodes that are powered off Resolves: rhbz#2132008 --- ...08-fence_virt-add-note-reboot-action.patch | 51 +++++++++++++++++++ fence-agents.spec | 9 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 bz2132008-fence_virt-add-note-reboot-action.patch diff --git a/bz2132008-fence_virt-add-note-reboot-action.patch b/bz2132008-fence_virt-add-note-reboot-action.patch new file mode 100644 index 0000000..212a051 --- /dev/null +++ b/bz2132008-fence_virt-add-note-reboot-action.patch @@ -0,0 +1,51 @@ +From d664c254608c9342785f92d3da2ff6ba2466df3b Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 4 Oct 2022 13:43:13 +0200 +Subject: [PATCH] fence_virt: add note that reboot-action doesnt power on nodes + that are powered off + +--- + agents/virt/client/options.c | 7 ++++--- + tests/data/metadata/fence_virt.xml | 4 +++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/agents/virt/client/options.c b/agents/virt/client/options.c +index ff624481b..ddd6bc4e0 100644 +--- a/agents/virt/client/options.c ++++ b/agents/virt/client/options.c +@@ -734,9 +734,9 @@ args_usage(char *progname, const char *optstr, int print_stdin) + + if (!print_stdin) { + if (progname) { +- printf("usage: %s [args]\n", progname); ++ printf("usage: %s [args]\n\nNOTE: reboot-action does not power on nodes that are powered off.\n\n", progname); + } else { +- printf("usage: fence_virt [args]\n"); ++ printf("usage: fence_virt [args]\n\nNOTE: reboot-action does not power on nodes that are powered off.\n\n"); + } + } + +@@ -766,7 +766,8 @@ args_metadata(char *progname, const char *optstr) + printf("\n"); + printf("\n", basename(progname)); + printf("%s is an I/O Fencing agent which can be used with " +- "virtual machines.\n", basename(progname)); ++ "virtual machines.\n\nNOTE: reboot-action does not power on nodes that are powered off." ++ "\n", basename(progname)); + printf("https://libvirt.org\n"); + printf("\n"); + +diff --git a/tests/data/metadata/fence_virt.xml b/tests/data/metadata/fence_virt.xml +index eb1959a11..612d4d3cb 100644 +--- a/tests/data/metadata/fence_virt.xml ++++ b/tests/data/metadata/fence_virt.xml +@@ -1,6 +1,8 @@ + + +-fence_virt is an I/O Fencing agent which can be used with virtual machines. ++fence_virt is an I/O Fencing agent which can be used with virtual machines. ++ ++NOTE: reboot-action does not power on nodes that are powered off. + https://libvirt.org + + diff --git a/fence-agents.spec b/fence-agents.spec index 364c8f0..c172819 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -59,7 +59,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 32%{?alphatag:.%{alphatag}}%{?dist} +Release: 33%{?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 @@ -221,6 +221,7 @@ Patch26: bz2093216-fence_ibm_powervs-proxy-private-api-servers.patch Patch27: bz2041933-bz2041935-3-fencing-source_env-dont-process-empty-lines.patch Patch28: bz2122944-fence_vmware_soap-set-timeout-cleanup-tmp-dirs.patch Patch29: bz2111998-fence_ibm_vpc-add-token-cache-support.patch +Patch30: bz2132008-fence_virt-add-note-reboot-action.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 @@ -361,6 +362,7 @@ BuildRequires: %{systemd_units} %patch27 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1427,6 +1429,11 @@ are located on corosync cluster nodes. %endif %changelog +* Wed Oct 5 2022 Oyvind Albrigtsen - 4.10.0-33 +- fence_virt: add note that reboot-action doesnt power on nodes that + are powered off + Resolves: rhbz#2132008 + * Fri Sep 9 2022 Oyvind Albrigtsen - 4.10.0-32 - add azure-identity and dependencies Resolves: rhbz#2121546