From 677d4663128e7a8ec8e3fc7d31938972ab550e3a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 14 2020 01:18:00 +0000 Subject: import fence-agents-4.2.1-51.el8 --- diff --git a/SOURCES/bz1793739-fence_vmware_rest-3-fix-encode-issue.patch b/SOURCES/bz1793739-fence_vmware_rest-3-fix-encode-issue.patch new file mode 100644 index 0000000..55b7f17 --- /dev/null +++ b/SOURCES/bz1793739-fence_vmware_rest-3-fix-encode-issue.patch @@ -0,0 +1,23 @@ +From 2ac3b05200477f3f04ce73de439e84c10a269552 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 2 Jul 2020 12:05:33 +0200 +Subject: [PATCH] fence_vmware_rest: remove .encode() that made the list action + fail on Python 3. It works fine with/without this on Python 2.x + +--- + agents/vmware_rest/fence_vmware_rest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/vmware_rest/fence_vmware_rest.py b/agents/vmware_rest/fence_vmware_rest.py +index a038a096..e49fd566 100644 +--- a/agents/vmware_rest/fence_vmware_rest.py ++++ b/agents/vmware_rest/fence_vmware_rest.py +@@ -61,7 +61,7 @@ def get_list(conn, options): + fail(EC_STATUS) + + for r in res["value"]: +- outlets[r["name"].encode("UTF-8")] = ("", state[r["power_state"]]) ++ outlets[r["name"]] = ("", state[r["power_state"]]) + + return outlets + diff --git a/SOURCES/bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch b/SOURCES/bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch new file mode 100644 index 0000000..c362210 --- /dev/null +++ b/SOURCES/bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch @@ -0,0 +1,23 @@ +From 39e96371ab9ab1318db004c0ddbb1049d1c0f474 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 11 Jun 2020 10:25:34 +0200 +Subject: [PATCH] fence_vmware_soap: log exception message for SSLError + exception + +--- + 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 53e8d8f4..f2ab68b0 100644 +--- a/agents/vmware_soap/fence_vmware_soap.py ++++ b/agents/vmware_soap/fence_vmware_soap.py +@@ -67,7 +67,7 @@ def soap_login(options): + + conn.service.Login(mo_SessionManager, options["--username"], options["--password"]) + except requests.exceptions.SSLError as ex: +- fail_usage("Server side certificate verification failed") ++ fail_usage("Server side certificate verification failed: %s" % ex) + except Exception: + fail(EC_LOGIN_DENIED) + diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index 9f98cc1..6b7fdfe 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: 49%{?alphatag:.%{alphatag}}%{?dist} +Release: 51%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -106,6 +106,8 @@ Patch64: bz1750596-fence_scsi-add-readonly-parameter.patch Patch65: bz1793739-fence_vmware_rest-1-fix-encoding.patch Patch66: bz1793739-fence_vmware_rest-2-support-utf-8-vm-names.patch Patch67: bz1839776-fence_aws-catch-connectionerror.patch +Patch68: bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch +Patch69: bz1793739-fence_vmware_rest-3-fix-encode-issue.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 @@ -251,6 +253,8 @@ BuildRequires: python3-google-api-client %patch65 -p1 -F1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 +%patch69 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1042,14 +1046,18 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Thu Jul 2 2020 Oyvind Albrigtsen - 4.2.1-51 +- fence_vmware_rest: fix encoding issues + Resolves: rhbz#1793739 + +* Thu Jun 11 2020 Oyvind Albrigtsen - 4.2.1-50 +- fence_vmware_soap: log exception message for SSLError exception + Resolves: rhbz#1796654 + * Wed May 27 2020 Oyvind Albrigtsen - 4.2.1-49 - fence_aws: improve logging by catching ConnectionError exception Resolves: rhbz#1839776 -* Wed May 20 2020 Oyvind Albrigtsen - 4.2.1-48 -- fence_vmware_rest: fix encoding issues - Resolves: rhbz#1793739 - * Fri May 15 2020 Oyvind Albrigtsen - 4.2.1-47 - fence_vmware_rest: add filter parameter to avoid 1000 VM API limit and avoid failing when hitting it during the monitor-action