From a3a0279b2c9b454f4aed09208ca0b5349487009025dfb1f1c783615c54dbd5f5 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Mon, 28 Aug 2017 09:35:48 +0000 Subject: [PATCH] - Update to version 4.0.25+git.1501671877.7bae40a0: * fence_ipmilan: add target support * Explicitly use version 3 of the oVirt API * fence_rhevm: fix "--api-path must not have an argument" issue * Convert URLs passed to pycurl to ASCII * fence_vbox: Add support for host on MacOS * fence_vbox: Add support for Windows host * fence_compute: fix to avoid breaking nova * fence_ipmilan: fix target support * fence_vmware_soap: fix for selfsigned certificate * fence_ipmilan: Add support for hexadecimal format of Kg key * fence_azure_arm: fix hardcoded path * fence_azure_arm: remove release/build info * fence_ipmilan: Fix inconsistency between help and manual page (defalt for --method) * fence_scsi: add FIPS support * fence_ipmilan: fix indentation * fencing_snmp: fix timemout typo - Drop outdated patch: * 0010-Make-pywsman-dependency-optional.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=65 --- 0010-Make-pywsman-dependency-optional.patch | 81 ------------------- _servicedata | 2 +- ...gents-4.0.25+git.1485179354.eb43835.tar.xz | 3 - ...ents-4.0.25+git.1501671877.7bae40a0.tar.xz | 3 + fence-agents.changes | 24 ++++++ fence-agents.spec | 6 +- 6 files changed, 30 insertions(+), 89 deletions(-) delete mode 100644 0010-Make-pywsman-dependency-optional.patch delete mode 100644 fence-agents-4.0.25+git.1485179354.eb43835.tar.xz create mode 100644 fence-agents-4.0.25+git.1501671877.7bae40a0.tar.xz diff --git a/0010-Make-pywsman-dependency-optional.patch b/0010-Make-pywsman-dependency-optional.patch deleted file mode 100644 index d42a8aa..0000000 --- a/0010-Make-pywsman-dependency-optional.patch +++ /dev/null @@ -1,81 +0,0 @@ -From dc8cc03057f3c4ac809689fd95a06da1e64dcb8f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= -Date: Tue, 14 Feb 2017 15:32:39 +0100 -Subject: [PATCH] Make pywsman dependency optional - -If the pywsman python library is only imported when it is actually used, -it becomes possible to generate the man pages for the fence_amt_ws agent -even if it is not installed. That then means that there is no need to -require pywsman for the whole fence-agents package to be installable. - -In our (SLE) case, pywsman is only available in the SDK module, so we -can't have a hard require on it in order to build or install the -fence-agents package for HA. ---- - configure.ac | 1 - - fence/agents/amt_ws/fence_amt_ws.py | 9 ++++++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4efa041..e17b95c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -163,7 +163,6 @@ AC_PYTHON_MODULE(suds, 1) - AC_PYTHON_MODULE(pexpect, 1) - AC_PYTHON_MODULE(pycurl, 1) - AC_PYTHON_MODULE(requests, 1) --AC_PYTHON_MODULE(pywsman, 1) - - ## path to 3rd-party binaries - AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool]) -diff --git a/fence/agents/amt_ws/fence_amt_ws.py b/fence/agents/amt_ws/fence_amt_ws.py -index 5284a77..b4343bb 100755 ---- a/fence/agents/amt_ws/fence_amt_ws.py -+++ b/fence/agents/amt_ws/fence_amt_ws.py -@@ -24,7 +24,6 @@ sys.path.append("@FENCEAGENTSLIBDIR@") - from fencing import * - from fencing import run_delay, fail_usage, fail, EC_STATUS - --import pywsman - from xml.etree import ElementTree - - -@@ -63,6 +62,8 @@ def xml_find(doc, namespace, item): - return tree.find(query) - - def _generate_power_action_input(action): -+ import pywsman -+ - method_input = "RequestPowerStateChange_INPUT" - address = 'http://schemas.xmlsoap.org/ws/2004/08/addressing' - anonymous = ('http://schemas.xmlsoap.org/ws/2004/08/addressing/' -@@ -87,6 +88,8 @@ def _generate_power_action_input(action): - return doc - - def get_power_status(_, options): -+ import pywsman -+ - client = pywsman.Client(options["--ip"], int(options["--ipport"]), \ - '/wsman', 'http', 'admin', options["--password"]) - namespace = CIM_AssociatedPowerManagementService -@@ -114,6 +117,8 @@ def get_power_status(_, options): - fail(EC_STATUS) - - def set_power_status(_, options): -+ import pywsman -+ - client = pywsman.Client(options["--ip"], int(options["--ipport"]), \ - '/wsman', 'http', 'admin', options["--password"]) - -@@ -142,6 +147,8 @@ def set_power_status(_, options): - fail(EC_STATUS) - - def set_boot_order(_, client, options): -+ import pywsman -+ - method_input = "ChangeBootOrder_INPUT" - address = 'http://schemas.xmlsoap.org/ws/2004/08/addressing' - anonymous = ('http://schemas.xmlsoap.org/ws/2004/08/addressing/' --- -2.10.1 - diff --git a/_servicedata b/_servicedata index d3f2c9b..6836ab2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/ClusterLabs/fence-agents.git - eb43835fc430651712271a046c61eec1c5ecdedb \ No newline at end of file + 7bae40a0eb02ae4abb8a3d470397b94e08f0b88b \ No newline at end of file diff --git a/fence-agents-4.0.25+git.1485179354.eb43835.tar.xz b/fence-agents-4.0.25+git.1485179354.eb43835.tar.xz deleted file mode 100644 index 87546af..0000000 --- a/fence-agents-4.0.25+git.1485179354.eb43835.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cdd559d9ffb536cf2d9e810fbd59a63e9a3cc5d71fa5ffd2fd3611ddbc2c437 -size 211280 diff --git a/fence-agents-4.0.25+git.1501671877.7bae40a0.tar.xz b/fence-agents-4.0.25+git.1501671877.7bae40a0.tar.xz new file mode 100644 index 0000000..c54faa1 --- /dev/null +++ b/fence-agents-4.0.25+git.1501671877.7bae40a0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb8659cdaa9ac3a84d01842725c94a51359127080bb35a5e447e8d3de9110250 +size 214276 diff --git a/fence-agents.changes b/fence-agents.changes index 3150add..0ffef55 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Aug 28 09:02:42 UTC 2017 - kgronlund@suse.com + +- Update to version 4.0.25+git.1501671877.7bae40a0: + * fence_ipmilan: add target support + * Explicitly use version 3 of the oVirt API + * fence_rhevm: fix "--api-path must not have an argument" issue + * Convert URLs passed to pycurl to ASCII + * fence_vbox: Add support for host on MacOS + * fence_vbox: Add support for Windows host + * fence_compute: fix to avoid breaking nova + * fence_ipmilan: fix target support + * fence_vmware_soap: fix for selfsigned certificate + * fence_ipmilan: Add support for hexadecimal format of Kg key + * fence_azure_arm: fix hardcoded path + * fence_azure_arm: remove release/build info + * fence_ipmilan: Fix inconsistency between help and manual page (defalt for --method) + * fence_scsi: add FIPS support + * fence_ipmilan: fix indentation + * fencing_snmp: fix timemout typo + +- Drop outdated patch: + * 0010-Make-pywsman-dependency-optional.patch + ------------------------------------------------------------------- Tue Feb 14 14:21:12 UTC 2017 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index f310db5..0257ad5 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -22,7 +22,7 @@ Name: fence-agents Summary: Fence Agents for Pacemaker from RHCS License: GPL-2.0 and LGPL-2.1 Group: Productivity/Clustering/HA -Version: 4.0.25+git.1485179354.eb43835 +Version: 4.0.25+git.1501671877.7bae40a0 Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz @@ -42,8 +42,6 @@ Patch6: 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch Patch7: 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch # PATCH-FIX-UPSTREAM: fence_compute: Fix disabling force_down on node when action is on Patch9: 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch -# PATCH-FIX-SLE: Make pywsman dependency optional (bsc#1025149) -Patch10: 0010-Make-pywsman-dependency-optional.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -55,6 +53,7 @@ BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss-devel +BuildRequires: openwsman-python BuildRequires: perl BuildRequires: perl-Net-Telnet BuildRequires: pkg-config @@ -115,7 +114,6 @@ fence agents only suitable for development. %patch6 -p1 %patch7 -p1 %patch9 -p1 -%patch10 -p1 %build CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"