From 151a8f1d11d9cc19c6505312356a05e131e2948d Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Oct 05 2018 12:57:13 +0000 Subject: - new upstream release --- diff --git a/fence-agents.spec b/fence-agents.spec index 6cdab69..ad05ebc 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -14,15 +14,13 @@ ## global alphatag git0a6184070 Name: fence-agents -Summary: Fence Agents for Red Hat Cluster -Version: 4.2.1 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Summary: Set of unified programs capable of host isolation ("fencing") +Version: 4.3.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents -Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz -Patch0: fence_vmware_soap-fix-python-3-suds-issue.patch -Patch1: python3-has_key-fixes.patch +Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz %if 0%{?fedora} || 0%{?rhel} > 7 %global allfenceagents fence-agents-alom fence-agents-amt fence-agents-amt-ws fence-agents-apc fence-agents-apc-snmp fence-agents-aws fence-agents-azure-arm fence-agents-bladecenter fence-agents-brocade fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-compute fence-agents-docker fence-agents-drac fence-agents-drac5 fence-agents-eaton-snmp fence-agents-emerson fence-agents-eps fence-agents-gce fence-agents-hds-cb fence-agents-heuristics-ping fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo2 fence-agents-ilo-mp fence-agents-ilo-ssh fence-agents-ilo-moonshot fence-agents-mpath fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-ironic fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-netio fence-agents-ovh fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-sanbox2 fence-agents-sbd fence-agents-scsi fence-agents-vbox fence-agents-vmware fence-agents-vmware-rest fence-agents-vmware-soap fence-agents-vmware-vcloud fence-agents-wti fence-agents-xenapi fence-agents-zvm @@ -44,7 +42,7 @@ BuildRequires: autoconf automake libtool %build ./autogen.sh -export PYTHON="/usr/bin/python3" %{configure} +%{configure} PYTHON="%{__python3}" CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags} %install @@ -79,15 +77,8 @@ Red Hat Fence Agents is a collection of scripts and libraries to handle remote p %{_datadir}/fence/fencing.py %{_datadir}/fence/fencing_snmp.py %exclude %{_datadir}/cluster/fence_scsi_check* -%exclude %{_sbindir}/fence_ack_manual -%exclude %{_mandir}/man8/fence_ack_manual.8* -%exclude %{_sbindir}/fence_dummy -%exclude %{_mandir}/man8/fence_dummy.8* -%exclude %{_sbindir}/fence_powerman -%exclude %{_mandir}/man8/fence_powerman.8* -%exclude %{_sbindir}/fence_zvm -%exclude %{_mandir}/man8/fence_zvm.8* - +%exclude %{_sbindir}/* +%exclude %{_mandir}/man8/* %package all License: GPLv2+, LGPLv2+ and ASL 2.0 @@ -880,6 +871,9 @@ The fence-agents-zvm package contains a fence agent for IBM z/VM over IP. %{_mandir}/man8/fence_zvmip.8* %changelog +* Fri Oct 5 2018 Oyvind Albrigtsen - 4.3.0-1 +- new upstream release + * Wed Aug 22 2018 Oyvind Albrigtsen - 4.2.1-3 - Python 3: fix has_key() issues diff --git a/fence_vmware_soap-fix-python-3-suds-issue.patch b/fence_vmware_soap-fix-python-3-suds-issue.patch deleted file mode 100644 index dc9df9e..0000000 --- a/fence_vmware_soap-fix-python-3-suds-issue.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9b763accb5c4c4a1cf60a19592a4033bcedec500 Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Fri, 15 Jun 2018 15:15:36 +0200 -Subject: [PATCH] fence_vmware_soap: fix Python 3 suds issue - ---- - 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 6a3b592f..b90edc9b 100644 ---- a/agents/vmware_soap/fence_vmware_soap.py -+++ b/agents/vmware_soap/fence_vmware_soap.py -@@ -56,7 +56,7 @@ def soap_login(options): - atexit.register(remove_tmp_dir, tmp_dir) - - try: -- headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : ""} -+ headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : "vim25"} - conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers) - - mo_ServiceInstance = Property('ServiceInstance') --- -2.17.1 - diff --git a/python3-has_key-fixes.patch b/python3-has_key-fixes.patch deleted file mode 100644 index 9252cb1..0000000 --- a/python3-has_key-fixes.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 29f93ed6f7f79cad801bf08ad9172c8a62183435 Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Tue, 14 Aug 2018 12:33:41 +0200 -Subject: [PATCH] fence_compute/fence_evacuate/fence_rhevm: dont use has_key - (not supported in Python 3) - ---- - agents/compute/fence_compute.py | 4 ++-- - agents/evacuate/fence_evacuate.py | 4 ++-- - agents/rhevm/fence_rhevm.py | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/agents/compute/fence_compute.py b/agents/compute/fence_compute.py -index ec2d093c..254e2670 100644 ---- a/agents/compute/fence_compute.py -+++ b/agents/compute/fence_compute.py -@@ -311,7 +311,7 @@ def create_nova_connection(options): - region_name=options["--region-name"], - endpoint_type=options["--endpoint-type"], - session=keystone_session, auth=keystone_auth, -- http_log_debug=options.has_key("--verbose")) -+ http_log_debug="--verbose" in options) - else: - # OSP >= 11 - # ArgSpec(args=['version'], varargs='args', keywords='kwargs', defaults=None) -@@ -319,7 +319,7 @@ def create_nova_connection(options): - region_name=options["--region-name"], - endpoint_type=options["--endpoint-type"], - session=keystone_session, auth=keystone_auth, -- http_log_debug=options.has_key("--verbose")) -+ http_log_debug="--verbose" in options) - - try: - nova.hypervisors.list() -diff --git a/agents/evacuate/fence_evacuate.py b/agents/evacuate/fence_evacuate.py -index 615dede7..6818c44f 100644 ---- a/agents/evacuate/fence_evacuate.py -+++ b/agents/evacuate/fence_evacuate.py -@@ -245,7 +245,7 @@ def create_nova_connection(options): - region_name=options["--region-name"], - endpoint_type=options["--endpoint-type"], - session=keystone_session, auth=keystone_auth, -- http_log_debug=options.has_key("--verbose")) -+ http_log_debug="--verbose" in options) - else: - # OSP >= 11 - # ArgSpec(args=['version'], varargs='args', keywords='kwargs', defaults=None) -@@ -253,7 +253,7 @@ def create_nova_connection(options): - region_name=options["--region-name"], - endpoint_type=options["--endpoint-type"], - session=keystone_session, auth=keystone_auth, -- http_log_debug=options.has_key("--verbose")) -+ http_log_debug="--verbose" in options) - - try: - nova.hypervisors.list() -diff --git a/agents/rhevm/fence_rhevm.py b/agents/rhevm/fence_rhevm.py -index 0594e66b..c06b7c39 100644 ---- a/agents/rhevm/fence_rhevm.py -+++ b/agents/rhevm/fence_rhevm.py -@@ -74,11 +74,11 @@ def send_command(opt, command, method="GET"): - url = "https:" - else: - url = "http:" -- if opt.has_key("--api-path"): -+ if "--api-path" in opt: - api_path = opt["--api-path"] - else: - api_path = "/ovirt-engine/api" -- if opt.has_key("--disable-http-filter"): -+ if "--disable-http-filter" in opt: - http_filter = 'false' - else: - http_filter = 'true' diff --git a/sources b/sources index 80279d1..4cad286 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fence-agents-4.2.1.tar.xz) = a48f3162c04852f6a4c4f97e344e93a67ebee3743423a47d954fdeafccb11a71d1878a6d1df1655b0023f97be992e7c8cad1d9dc60d129ea49190c0206d53493 +SHA512 (fence-agents-4.3.0.tar.gz) = b1f131a7a6f1d83e72db6ad6c8ce663b0e1de41fd35a5fce3544f4f524c7aaecff46ab16a5b6fe0e75c4dabaac52818508b0e8580eb9bac54f0da5604ec5e927