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

import fence-agents-4.10.0-43.el9

Browse Source
This commit is contained in:
CentOS Sources 2023-05-09 05:21:29 +00:00 committed by Stepan Oksanichenko
parent 5b1a41389c
commit 418402558c
15 changed files with 1997 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.fence-agents.metadata
View File

@ -47,8 +47,7 @@ ecd73099139d222059443ad19dfeee3f715e1ab0 SOURCES/msal-1.18.0.tar.gz
04e016bd1fa4ed6ddb852095a45d4f8c81a5b54a SOURCES/msal-extensions-1.0.0.tar.gz
ba59fbd147307e7ef92a1fad259e7dc0b07e79e0 SOURCES/msrest-0.6.21-py2.py3-none-any.whl
3d65a50b68e3aa506b6af42be485ed2710afa9da SOURCES/msrestazure-0.6.4-py2.py3-none-any.whl
0b5ba4c47bdd7ff17ca4954349d7213a95d03f25 SOURCES/oauthlib-3.1.1-py2.py3-none-any.whl
f6efa66f6106b069b5c0e0cf8cc677e4e96c91ca SOURCES/oauthlib-3.1.1.tar.gz
7e2f8f4cebf309ef6aaf740ee9073276d6937802 SOURCES/oauthlib-3.2.2.tar.gz
570d69d8c108ebb8aee562389d13b07dfb61ce25 SOURCES/openshift-0.12.1.tar.gz
2b10cb7681bc678ba4ff3be524b28d783e4095ce SOURCES/packaging-20.9-py2.py3-none-any.whl
bccbc1bf76a9db46998eb8e1ffa2f2a2baf9237a SOURCES/packaging-21.2-py3-none-any.whl

3
.gitignore vendored
View File

@ -47,8 +47,7 @@ SOURCES/msal-1.18.0.tar.gz
SOURCES/msal-extensions-1.0.0.tar.gz
SOURCES/msrest-0.6.21-py2.py3-none-any.whl
SOURCES/msrestazure-0.6.4-py2.py3-none-any.whl
SOURCES/oauthlib-3.1.1-py2.py3-none-any.whl
SOURCES/oauthlib-3.1.1.tar.gz
SOURCES/oauthlib-3.2.2.tar.gz
SOURCES/openshift-0.12.1.tar.gz
SOURCES/packaging-20.9-py2.py3-none-any.whl
SOURCES/packaging-21.2-py3-none-any.whl

0
SOURCES/bz2127878-fence_ibm_vpc-add-token-cache-support.patch → SOURCES/bz2111998-fence_ibm_vpc-add-token-cache-support.patch
View File

70
SOURCES/bz2122944-1-fence_vmware_soap-set-timeout-cleanup-tmp-dirs.patch Normal file
View File

@ -0,0 +1,70 @@
From d4d2dd5066b62210a05c1256c6aee39609e3a974 Mon Sep 17 00:00:00 2001
From: Thanasis Katsios <thkatsios@gmail.com>
Date: Mon, 1 Nov 2021 12:31:36 +0200
Subject: [PATCH 1/3] fence_vmware_soap: Use --login-timeout option
Fixes issue #446.
---
agents/vmware_soap/fence_vmware_soap.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/agents/vmware_soap/fence_vmware_soap.py b/agents/vmware_soap/fence_vmware_soap.py
index a7f08b3d6..034695931 100644
--- a/agents/vmware_soap/fence_vmware_soap.py
+++ b/agents/vmware_soap/fence_vmware_soap.py
@@ -57,7 +57,8 @@ def soap_login(options):
try:
headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : "vim25"}
- conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers)
+ login_timeout = int(options["--login-timeout"])
+ conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers, timeout=login_timeout)
mo_ServiceInstance = Property('ServiceInstance')
mo_ServiceInstance._type = 'ServiceInstance'
From 1e8f0d7582c7768149269f8d002d71b2febbdda0 Mon Sep 17 00:00:00 2001
From: Thanasis Katsios <thkatsios@gmail.com>
Date: Tue, 2 Nov 2021 16:52:59 +0200
Subject: [PATCH 2/3] Set timeout to 60s when disable-timeouts is used
---
agents/vmware_soap/fence_vmware_soap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/vmware_soap/fence_vmware_soap.py b/agents/vmware_soap/fence_vmware_soap.py
index 034695931..38101352e 100644
--- a/agents/vmware_soap/fence_vmware_soap.py
+++ b/agents/vmware_soap/fence_vmware_soap.py
@@ -57,7 +57,7 @@ def soap_login(options):
try:
headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : "vim25"}
- login_timeout = int(options["--login-timeout"])
+ login_timeout = 60 if "--disable-timeout" in options and options["--disable-timeout"] != "false" else int(options["--login-timeout"])
conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers, timeout=login_timeout)
mo_ServiceInstance = Property('ServiceInstance')
From 8094c8a5a06adf0bd891d4fddcc0b72861a0947e Mon Sep 17 00:00:00 2001
From: Thanasis Katsios <thkatsios@gmail.com>
Date: Tue, 2 Nov 2021 18:51:02 +0200
Subject: [PATCH 3/3] Support disable-timeout simplification
---
agents/vmware_soap/fence_vmware_soap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/vmware_soap/fence_vmware_soap.py b/agents/vmware_soap/fence_vmware_soap.py
index 38101352e..2cd45e0b3 100644
--- a/agents/vmware_soap/fence_vmware_soap.py
+++ b/agents/vmware_soap/fence_vmware_soap.py
@@ -57,7 +57,7 @@ def soap_login(options):
try:
headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : "vim25"}
- login_timeout = 60 if "--disable-timeout" in options and options["--disable-timeout"] != "false" else int(options["--login-timeout"])
+ login_timeout = int(options["--login-timeout"]) or 60
conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers, timeout=login_timeout)
mo_ServiceInstance = Property('ServiceInstance')

23
SOURCES/bz2122944-2-fence_vmware_soap-login-timeout-15s.patch Normal file
View File

@ -0,0 +1,23 @@
From 2d4b3ea47fa7a9a301d34cefc8f279cae7df4afd Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 26 Jan 2023 13:19:16 +0100
Subject: [PATCH] fence_vmware_soap: set login_timeout lower than default
pcmk_monitor_timeout (20s) to remove tmp dirs on fail
---
agents/vmware_soap/fence_vmware_soap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/vmware_soap/fence_vmware_soap.py b/agents/vmware_soap/fence_vmware_soap.py
index b1d27a9fb..4a4ec1780 100644
--- a/agents/vmware_soap/fence_vmware_soap.py
+++ b/agents/vmware_soap/fence_vmware_soap.py
@@ -57,7 +57,7 @@ def soap_login(options):
try:
headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : "vim25"}
- login_timeout = int(options["--login-timeout"]) or 60
+ login_timeout = int(options["--login-timeout"]) or 15
conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers, timeout=login_timeout)
mo_ServiceInstance = Property('ServiceInstance')

51
SOURCES/bz2132008-fence_virt-add-note-reboot-action.patch Normal file
View File

@ -0,0 +1,51 @@
From d664c254608c9342785f92d3da2ff6ba2466df3b Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
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("<?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 "
- "virtual machines.</longdesc>\n", basename(progname));
+ "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");
printf("<parameters>\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 @@
<?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>
+<longdesc>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.</longdesc>
<vendor-url>https://libvirt.org</vendor-url>
<parameters>
<parameter name="debug" unique="0" required="0">

33
SOURCES/bz2134015-fence_lpar-only-output-additional-info-on-debug.patch Normal file
View File

@ -0,0 +1,33 @@
From 46f94d4dbad868afc70b96bd612323221991d06e Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Tue, 11 Oct 2022 09:51:24 +0200
Subject: [PATCH] fence_lpar: only output additional error output on DEBUG
level
Without this patch we get ERROR logged with trace info when doing
status-action for nodes that doesnt exist.
---
agents/lpar/fence_lpar.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/agents/lpar/fence_lpar.py b/agents/lpar/fence_lpar.py
index 2046b0e4e..975971a57 100644
--- a/agents/lpar/fence_lpar.py
+++ b/agents/lpar/fence_lpar.py
@@ -12,6 +12,7 @@
import sys, re
import atexit
+import logging
sys.path.append("@FENCEAGENTSLIBDIR@")
from fencing import *
from fencing import fail, fail_usage, EC_STATUS_HMC
@@ -48,7 +49,7 @@ def get_power_status(conn, options):
elif options["--hmc-version"] in ["4", "IVM"]:
status = re.compile(",state=(.*?),", re.IGNORECASE).search(conn.before).group(1)
except AttributeError as e:
- fail_usage("Command on HMC failed: {}\n{}".format(command, str(e)), False)
+ logging.debug("Command on HMC failed: {}\n{}".format(command, str(e)))
fail(EC_STATUS_HMC)
return _normalize_status(status)

46
SOURCES/bz2136191-fence_ibm_powervs-improve-defaults.patch Normal file
View File

@ -0,0 +1,46 @@
From 3373431dc49d6e429bbf613765385cb33a56e917 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Tue, 25 Oct 2022 10:39:29 +0200
Subject: [PATCH] fence_ibm_powervs: improve defaults based on testing
---
agents/ibm_powervs/fence_ibm_powervs.py | 4 ++--
tests/data/metadata/fence_ibm_powervs.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/agents/ibm_powervs/fence_ibm_powervs.py b/agents/ibm_powervs/fence_ibm_powervs.py
index b0caed7c5..183893616 100755
--- a/agents/ibm_powervs/fence_ibm_powervs.py
+++ b/agents/ibm_powervs/fence_ibm_powervs.py
@@ -232,10 +232,10 @@ def main():
atexit.register(atexit_handler)
define_new_opts()
- all_opt["shell_timeout"]["default"] = "15"
+ all_opt["shell_timeout"]["default"] = "500"
all_opt["power_timeout"]["default"] = "30"
all_opt["power_wait"]["default"] = "1"
- all_opt["stonith_status_sleep"]["default"] = "3"
+ all_opt["stonith_status_sleep"]["default"] = "2"
all_opt["api-type"]["default"] = "private"
all_opt["proxy"]["default"] = ""
diff --git a/tests/data/metadata/fence_ibm_powervs.xml b/tests/data/metadata/fence_ibm_powervs.xml
index 40c494110..326bc2378 100644
--- a/tests/data/metadata/fence_ibm_powervs.xml
+++ b/tests/data/metadata/fence_ibm_powervs.xml
@@ -119,12 +119,12 @@
</parameter>
<parameter name="shell_timeout" unique="0" required="0">
<getopt mixed="--shell-timeout=[seconds]" />
- <content type="second" default="15" />
+ <content type="second" default="500" />
<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
</parameter>
<parameter name="stonith_status_sleep" unique="0" required="0">
<getopt mixed="--stonith-status-sleep=[seconds]" />
- <content type="second" default="3" />
+ <content type="second" default="2" />
<shortdesc lang="en">Sleep X seconds between status calls during a STONITH action</shortdesc>
</parameter>
<parameter name="retry_on" unique="0" required="0">

29
SOURCES/bz2138823-fence_virtd-update-manpage.patch Normal file
View File

@ -0,0 +1,29 @@
From 6817d9ff018aa1af6fb9775bc9ae1f1cc07fa1ea Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 31 Oct 2022 10:54:10 +0100
Subject: [PATCH] fence_virtd: add link and non-user socket example to man page
---
agents/virt/man/fence_virt.conf.5 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/agents/virt/man/fence_virt.conf.5 b/agents/virt/man/fence_virt.conf.5
index c23ffd943..c8434ed65 100644
--- a/agents/virt/man/fence_virt.conf.5
+++ b/agents/virt/man/fence_virt.conf.5
@@ -230,6 +230,15 @@ by a user running a cluster of virtual machines on a single desktop computer.
.
the URI to use when connecting to libvirt.
+All libvirt URIs are accepted and passed as-is.
+
+See https://libvirt.org/uri.html#remote-uris for examples.
+
+NOTE: When VMs are run as non-root user the socket path must be set as part
+of the URI.
+
+Example: qemu:///session?socket=/run/user/<UID>/libvirt/virtqemud-sock
+
.SS libvirt-qmf
The libvirt-qmf plugin acts as a QMFv2 Console to the libvirt-qmf daemon in

114
SOURCES/bz2144531-fence_virtd-warn-files-not-mode-600.patch Normal file
View File

@ -0,0 +1,114 @@
From 3b311a1b069cec59f3d47242282f5d9c67a82e06 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 21 Nov 2022 12:33:22 +0100
Subject: [PATCH] fence_virtd: make fence_virtd.conf file mode 600 and fail if
fence_virtd.conf or key file are not mode 600
---
agents/virt/config/Makefile.am | 3 +++
agents/virt/include/simpleconfig.h | 2 ++
agents/virt/server/config.c | 26 ++++++++++++++++++++++++++
agents/virt/server/main.c | 16 ++++++++++++++++
4 files changed, 47 insertions(+)
diff --git a/agents/virt/config/Makefile.am b/agents/virt/config/Makefile.am
index 86d8df415..19d974278 100644
--- a/agents/virt/config/Makefile.am
+++ b/agents/virt/config/Makefile.am
@@ -37,5 +37,8 @@ y.tab.c: config.y
config.c: y.tab.c config.l
$(LEX) -oconfig.c $(srcdir)/config.l
+install-exec-hook:
+ chmod 600 $(DESTDIR)$(sysconfdir)/fence_virt.conf
+
clean-local:
rm -f config.tab.c config.tab.h config.c y.tab.c y.tab.h
diff --git a/agents/virt/include/simpleconfig.h b/agents/virt/include/simpleconfig.h
index 83d54377a..6aba85f02 100644
--- a/agents/virt/include/simpleconfig.h
+++ b/agents/virt/include/simpleconfig.h
@@ -49,6 +49,8 @@ config_object_t *sc_init(void);
/* Frees a previously-allocated copy of our simple config object */
void sc_release(config_object_t *c);
+int check_file_permissions(const char *fname);
+
int do_configure(config_object_t *config, const char *filename);
#endif
diff -uNr a/agents/virt/server/config.c b/agents/virt/server/config.c
--- a/agents/virt/server/config.c 2021-07-08 13:09:05.000000000 +0200
+++ b/agents/virt/server/config.c 2022-11-22 10:59:09.547919852 +0100
@@ -11,6 +11,7 @@
#include <fcntl.h>
#include <net/if.h>
#include <arpa/inet.h>
+#include <errno.h>
#include "simpleconfig.h"
#include "static_map.h"
@@ -595,6 +596,31 @@ listener_configure(config_object_t *config)
}
+int
+check_file_permissions(const char *fname)
+{
+ struct stat st;
+ mode_t file_perms = 0600;
+ int ret;
+
+ ret = stat(fname, &st);
+ if (ret != 0) {
+ printf("stat failed on file '%s': %s\n",
+ fname, strerror(errno));
+ return 1;
+ }
+
+ if ((st.st_mode & 0777) != file_perms) {
+ printf("WARNING: invalid permissions on file "
+ "'%s': has 0%o should be 0%o\n", fname,
+ (unsigned int)(st.st_mode & 0777),
+ (unsigned int)file_perms);
+ return 1;
+ }
+
+ return 0;
+}
+
int
do_configure(config_object_t *config, const char *config_file)
{
diff -uNr a/agents/virt/server/main.c b/agents/virt/server/main.c
--- a/agents/virt/server/main.c 2021-07-08 13:09:05.000000000 +0200
+++ b/agents/virt/server/main.c 2022-11-22 10:58:05.894530187 +0100
@@ -14,7 +14,9 @@
/* Local includes */
#include "simpleconfig.h"
#include "static_map.h"
+#include "xvm.h"
#include "server_plugin.h"
+#include "simple_auth.h"
#include "debug.h"
/* configure.c */
@@ -203,6 +205,18 @@
snprintf(pid_file, PATH_MAX, "/var/run/%s.pid", basename(argv[0]));
}
+ check_file_permissions(config_file);
+
+ sprintf(val, "listeners/%s/@key_file", listener_name);
+ if (sc_get(config, val,
+ val, sizeof(val)-1) == 0) {
+ dbg_printf(1, "Got %s for key_file\n", val);
+ } else {
+ snprintf(val, sizeof(val), "%s", DEFAULT_KEY_FILE);
+ }
+
+ check_file_permissions(val);
+
openlog(basename(argv[0]), LOG_NDELAY | LOG_PID, LOG_DAEMON);
daemon_init(basename(argv[0]), pid_file, foreground);

55
SOURCES/bz2149655-fence_virtd-update-fence_virt.conf-manpage.patch Normal file
View File

@ -0,0 +1,55 @@
From 6f213eb637bf7d957ba035e3aa09ce1f1bbccf84 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
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";
}
}

74
SOURCES/bz2152107-fencing-1-add-plug_separator.patch Normal file
View File

@ -0,0 +1,74 @@
From 90ea995038e560222f9345310f31a79b595a5219 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 24 Nov 2022 10:19:29 +0100
Subject: [PATCH 1/2] fencing: add plug_separator parameter to be able to
specify one that isnt part of the plug name(s)
---
lib/fencing.py.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/fencing.py.py b/lib/fencing.py.py
index 940bd01d1..cf1c48e78 100644
--- a/lib/fencing.py.py
+++ b/lib/fencing.py.py
@@ -322,6 +322,13 @@
"help" : "-6, --inet6-only Forces agent to use IPv6 addresses only",
"required" : "0",
"order" : 1},
+ "plug_separator" : {
+ "getopt" : ":",
+ "longopt" : "plug-separator",
+ "help" : "--plug-separator=[char] Separator for plug parameter when specifying more than 1 plug",
+ "default" : ",",
+ "required" : "0",
+ "order" : 100},
"separator" : {
"getopt" : "C:",
"longopt" : "separator",
@@ -934,7 +941,7 @@ def fence_action(connection, options, set_power_fn, get_power_fn, get_outlet_lis
try:
if "--plug" in options:
- options["--plugs"] = options["--plug"].split(",")
+ options["--plugs"] = options["--plug"].split(options["--plug-separator"])
## Process options that manipulate fencing device
#####
From 55e2a56b81ed2188dedfce07cc3155e2175183cd Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 28 Nov 2022 12:40:00 +0100
Subject: [PATCH 2/2] fence_wti: increase login timeout to avoid random
timeouts
---
agents/wti/fence_wti.py | 1 +
tests/data/metadata/fence_wti.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/agents/wti/fence_wti.py b/agents/wti/fence_wti.py
index 68640ae65..97cc66de2 100644
--- a/agents/wti/fence_wti.py
+++ b/agents/wti/fence_wti.py
@@ -178,6 +178,7 @@ def main():
atexit.register(atexit_handler)
all_opt["cmd_prompt"]["default"] = ["RSM>", "MPC>", "IPS>", "TPS>", "NBB>", "NPS>", "VMR>"]
+ all_opt["login_timeout"]["default"] = "10"
options = check_input(device_opt, process_input(device_opt))
diff --git a/tests/data/metadata/fence_wti.xml b/tests/data/metadata/fence_wti.xml
index 6bdccd2dc..8e15f4852 100644
--- a/tests/data/metadata/fence_wti.xml
+++ b/tests/data/metadata/fence_wti.xml
@@ -153,7 +153,7 @@
</parameter>
<parameter name="login_timeout" unique="0" required="0">
<getopt mixed="--login-timeout=[seconds]" />
- <content type="second" default="5" />
+ <content type="second" default="10" />
<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
</parameter>
<parameter name="power_timeout" unique="0" required="0">

1382
SOURCES/bz2152107-fencing-2-update-DEPENDENCY_OPT.patch Normal file
View File

File diff suppressed because it is too large Load Diff

30
SOURCES/bz2160480-fence_scsi-fix-validate-all.patch Normal file
View File

@ -0,0 +1,30 @@
From a416a367a804f1e5abaf142c629fe6ab5572d3b6 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 12 Jan 2023 15:46:41 +0100
Subject: [PATCH] fence_scsi: skip key generation during validate-all action
---
agents/scsi/fence_scsi.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/agents/scsi/fence_scsi.py b/agents/scsi/fence_scsi.py
index e33339614..f9e6823b2 100644
--- a/agents/scsi/fence_scsi.py
+++ b/agents/scsi/fence_scsi.py
@@ -566,11 +566,12 @@ def main():
or ("--key" in options and options["--key"])):
fail_usage("Failed: nodename or key is required", stop_after_error)
- if not ("--key" in options and options["--key"]):
- options["--key"] = generate_key(options)
+ if options["--action"] != "validate-all":
+ if not ("--key" in options and options["--key"]):
+ options["--key"] = generate_key(options)
- if options["--key"] == "0" or not options["--key"]:
- fail_usage("Failed: key cannot be 0", stop_after_error)
+ if options["--key"] == "0" or not options["--key"]:
+ fail_usage("Failed: key cannot be 0", stop_after_error)
if "--key-value" in options\
and (options["--key-value"] != "id" and options["--key-value"] != "hash"):

106
SPECS/fence-agents.spec
View File

@ -8,6 +8,9 @@
# bundles
%global bundled_lib_dir bundled
# azure
%global oauthlib oauthlib
%global oauthlib_version 3.2.2
# kubevirt
%global openshift openshift
%global openshift_version 0.12.1
@ -49,8 +52,6 @@
%global idna_version 3.3
%global reqstsoauthlib requests-oauthlib
%global reqstsoauthlib_version 1.3.0
%global oauthlib oauthlib
%global oauthlib_version 3.1.1
%global ruamelyaml ruamel.yaml
%global ruamelyaml_version 0.17.16
%global setuptools setuptools
@ -59,7 +60,7 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.10.0
Release: 30%{?alphatag:.%{alphatag}}%{?dist}.1
Release: 43%{?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
@ -115,7 +116,7 @@ Source1031: idna-2.10-py2.py3-none-any.whl
Source1032: isodate-0.6.0-py2.py3-none-any.whl
Source1033: msrest-0.6.21-py2.py3-none-any.whl
Source1034: msrestazure-0.6.4-py2.py3-none-any.whl
Source1035: oauthlib-3.1.1-py2.py3-none-any.whl
Source1035: %{oauthlib}-%{oauthlib_version}.tar.gz
Source1036: PyJWT-2.1.0-py3-none-any.whl
Source1037: requests-2.25.1-py2.py3-none-any.whl
Source1038: requests_oauthlib-1.3.0-py2.py3-none-any.whl
@ -179,16 +180,15 @@ Source1087: %{requests}-%{requests_version}.tar.gz
Source1088: %{chrstnormalizer}-%{chrstnormalizer_version}.tar.gz
Source1089: %{idna}-%{idna_version}.tar.gz
Source1090: %{reqstsoauthlib}-%{reqstsoauthlib_version}.tar.gz
Source1091: %{oauthlib}-%{oauthlib_version}.tar.gz
Source1092: %{ruamelyaml}-%{ruamelyaml_version}.tar.gz
Source1093: %{setuptools}-%{setuptools_version}.tar.gz
Source1091: %{ruamelyaml}-%{ruamelyaml_version}.tar.gz
Source1092: %{setuptools}-%{setuptools_version}.tar.gz
## required for installation
Source1094: setuptools_scm-6.3.2.tar.gz
Source1095: packaging-21.2-py3-none-any.whl
Source1096: poetry-core-1.0.7.tar.gz
Source1097: pyparsing-3.0.1.tar.gz
Source1098: tomli-1.0.1.tar.gz
Source1099: wheel-0.37.0-py2.py3-none-any.whl
Source1093: setuptools_scm-6.3.2.tar.gz
Source1094: packaging-21.2-py3-none-any.whl
Source1095: poetry-core-1.0.7.tar.gz
Source1096: pyparsing-3.0.1.tar.gz
Source1097: tomli-1.0.1.tar.gz
Source1098: wheel-0.37.0-py2.py3-none-any.whl
### END
Patch0: ha-cloud-support-aliyun.patch
@ -219,7 +219,18 @@ Patch24: bz2072420-2-fence_zvmip-connect-error.patch
Patch25: bz2092385-fence_ibm_vpc-add-proxy-support.patch
Patch26: bz2093216-fence_ibm_powervs-proxy-private-api-servers.patch
Patch27: bz2041933-bz2041935-3-fencing-source_env-dont-process-empty-lines.patch
Patch28: bz2127878-fence_ibm_vpc-add-token-cache-support.patch
Patch28: bz2122944-1-fence_vmware_soap-set-timeout-cleanup-tmp-dirs.patch
Patch29: bz2122944-2-fence_vmware_soap-login-timeout-15s.patch
Patch30: bz2111998-fence_ibm_vpc-add-token-cache-support.patch
Patch31: bz2132008-fence_virt-add-note-reboot-action.patch
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
Patch37: bz2160480-fence_scsi-fix-validate-all.patch
Patch38: bz2152107-fencing-1-add-plug_separator.patch
Patch39: bz2152107-fencing-2-update-DEPENDENCY_OPT.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
@ -359,6 +370,17 @@ BuildRequires: %{systemd_units}
%patch26 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
# prevent compilation of something that won't get used anyway
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@ -1425,11 +1447,59 @@ are located on corosync cluster nodes.
%endif
%changelog
* Mon Sep 19 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-30.1
- fence_ibm_vpc: add token cache support
Resolves: rhbz#2127878
* Thu Jan 26 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-43
- fence_vmware_soap: set login_timeout lower than default
pcmk_monitor_timeout (20s) to remove tmp dirs
Resolves: rhbz#2122944
* Tue Jan 24 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-42
- fencing/fence_wti: add --plug-separator to be able to avoid
characters that are in node name(s)
Resolves: rhbz#2152107
* Fri Jan 13 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-41
- fence_scsi: skip key generation during validate-all action
Resolves: rhbz#2160480
* Fri Dec 2 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-40
- fence_virtd: add info about multiple uuid/ip entries to manpage
Resolves: rhbz#2149655
* Tue Nov 22 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-39
- fence_virtd: warn if config or key file(s) are not mode 600
Resolves: rhbz#2144531
* Tue Nov 8 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-37
- Upgrade bundled python-oauthlib
Resolves: rhbz#2128564
* Mon Oct 31 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-36
- fence_virtd: add link to uri examples and uri w/socket path
example for when VMS are run as non-root user to manpage
Resolves: rhbz#2138823
* Tue Oct 25 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-35
- fence_ibm_powervs: improve defaults
Resolves: rhbz#2136191
* Wed Oct 12 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-34
- fence_lpar: only output additional output info on DEBUG level
Resolves: rhbz#2134015
* Wed Oct 5 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 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 <oalbrigt@redhat.com> - 4.10.0-32
- add azure-identity and dependencies
Resolves: rhbz#2127882
Resolves: rhbz#2121546
* Tue Aug 16 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-31
- fence_ibm_vpc: add token cache support
Resolves: rhbz#2111998
* Tue Aug 16 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-30
- fence_openstack: add support for reading config from clouds.yaml