From f1c534faf0ed8198bbc8b5788e13db7e9a5c602b5884f2a568ba173634d7e7a0 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Thu, 9 Aug 2018 13:37:15 +0000 Subject: [PATCH 1/2] - Update to version 4.2.1+git.1532964592.3ae5b58e: * fence_aliyun: Add Aliyun fence agent. (fate#326557) * fence_gce: add power cycle as default method * fence_gce: set project and zone as not required * fence_gce: add support for stackdriver logging * fence_ilo3/fence_ipmilan: show correct default method (onoff) in help * fence_mpath: add watchdog support * fence_amt_ws: create metadata without agent specific libs OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=101 --- _servicedata | 2 +- fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz | 3 --- fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz | 3 +++ fence-agents.changes | 12 ++++++++++++ fence-agents.spec | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz create mode 100644 fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz diff --git a/_servicedata b/_servicedata index 1ee9eb7..43aea83 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/ClusterLabs/fence-agents.git - 9b763accb5c4c4a1cf60a19592a4033bcedec500 \ No newline at end of file + 790cbaa66f3927a84739af4a1f0e8bba295cdc36 \ No newline at end of file diff --git a/fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz b/fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz deleted file mode 100644 index 0a1a923..0000000 --- a/fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eafd2de2c6caa66fe49df43b1764f3cb261adcaf71b4bdbf15032ced449817b3 -size 228396 diff --git a/fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz b/fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz new file mode 100644 index 0000000..1457e9e --- /dev/null +++ b/fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:901ac23fdd4eacc00143c2d37362bc7069d9930c0fc1bfefed55ded7abda30f4 +size 230288 diff --git a/fence-agents.changes b/fence-agents.changes index 27fa774..f2d71b6 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 09 13:25:09 UTC 2018 - kgronlund@suse.com + +- Update to version 4.2.1+git.1532964592.3ae5b58e: + * fence_aliyun: Add Aliyun fence agent. (fate#326557) + * fence_gce: add power cycle as default method + * fence_gce: set project and zone as not required + * fence_gce: add support for stackdriver logging + * fence_ilo3/fence_ipmilan: show correct default method (onoff) in help + * fence_mpath: add watchdog support + * fence_amt_ws: create metadata without agent specific libs + ------------------------------------------------------------------- Wed Jun 27 07:38:02 UTC 2018 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 32b0f83..938f059 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -29,7 +29,7 @@ Name: fence-agents Summary: Fence Agents for High Availability License: GPL-2.0-only AND LGPL-2.1-only Group: Productivity/Clustering/HA -Version: 4.2.1+git.1529316875.1a39345b +Version: 4.2.1+git.1532964592.3ae5b58e Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz From 833927d89b8a2bff9430a14904b03de508959ecab43e2c68950055e392572b94 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Thu, 9 Aug 2018 14:18:39 +0000 Subject: [PATCH 2/2] - Drop obsolete patch: * Remove 0002-Build-without-openwsman-installed.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=102 --- 0002-Build-without-openwsman-installed.patch | 108 ------------------- fence-agents.changes | 2 + fence-agents.spec | 3 - 3 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 0002-Build-without-openwsman-installed.patch diff --git a/0002-Build-without-openwsman-installed.patch b/0002-Build-without-openwsman-installed.patch deleted file mode 100644 index dcf7fce..0000000 --- a/0002-Build-without-openwsman-installed.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 36fe441cda4f59400b18f558a668d025123b1129 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= -Date: Mon, 25 Jun 2018 16:43:38 +0200 -Subject: [PATCH] Build without openwsman installed - ---- - agents/amt_ws/fence_amt_ws.py | 21 +++++++++++++-------- - configure.ac | 14 +++++++------- - 2 files changed, 20 insertions(+), 15 deletions(-) - -diff --git a/agents/amt_ws/fence_amt_ws.py b/agents/amt_ws/fence_amt_ws.py -index b99f20ad..bb0f58f5 100755 ---- a/agents/amt_ws/fence_amt_ws.py -+++ b/agents/amt_ws/fence_amt_ws.py -@@ -24,9 +24,14 @@ sys.path.append("@FENCEAGENTSLIBDIR@") - from fencing import * - from fencing import run_delay, fail_usage, fail, EC_STATUS - --import pywsman - from xml.etree import ElementTree - -+ -+def _pywsman(): -+ import pywsman -+ return pywsman -+ -+ - POWER_ON='2' - POWER_OFF='8' - POWER_CYCLE='10' -@@ -63,7 +68,7 @@ def _generate_power_action_input(action): - wsman = 'http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd' - namespace = CIM_PowerManagementService - -- doc = pywsman.XmlDoc(method_input) -+ doc = _pywsman().XmlDoc(method_input) - root = doc.root() - root.set_ns(namespace) - root.add(namespace, 'PowerState', action) -@@ -80,10 +85,10 @@ def _generate_power_action_input(action): - return doc - - def get_power_status(_, options): -- client = pywsman.Client(options["--ip"], int(options["--ipport"]), \ -+ client = _pywsman().Client(options["--ip"], int(options["--ipport"]), \ - '/wsman', 'http', 'admin', options["--password"]) - namespace = CIM_AssociatedPowerManagementService -- client_options = pywsman.ClientOptions() -+ client_options = _pywsman().ClientOptions() - doc = client.get(client_options, namespace) - _SOAP_ENVELOPE = 'http://www.w3.org/2003/05/soap-envelope' - item = 'Fault' -@@ -107,11 +112,11 @@ def get_power_status(_, options): - fail(EC_STATUS) - - def set_power_status(_, options): -- client = pywsman.Client(options["--ip"], int(options["--ipport"]), \ -+ client = _pywsman().Client(options["--ip"], int(options["--ipport"]), \ - '/wsman', 'http', 'admin', options["--password"]) - - method = 'RequestPowerStateChange' -- client_options = pywsman.ClientOptions() -+ client_options = _pywsman().ClientOptions() - client_options.add_selector('Name', 'Intel(r) AMT Power Management Service') - - if options["--action"] == "on": -@@ -156,11 +161,11 @@ def set_boot_order(_, client, options): - return - - method = 'ChangeBootOrder' -- client_options = pywsman.ClientOptions() -+ client_options = _pywsman().ClientOptions() - client_options.add_selector('InstanceID', \ - 'Intel(r) AMT: Boot Configuration 0') - -- doc = pywsman.XmlDoc(method_input) -+ doc = _pywsman().XmlDoc(method_input) - root = doc.root() - root.set_ns(namespace) - -diff --git a/configure.ac b/configure.ac -index e8b24211..c4db8a47 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -208,13 +208,13 @@ AC_PYTHON_MODULE(pexpect, 1) - AC_PYTHON_MODULE(pycurl, 1) - AC_PYTHON_MODULE(requests, 1) - --if echo "$AGENTS_LIST" | grep -q amt_ws; then -- AC_PYTHON_MODULE(pywsman) -- if test "x${HAVE_PYMOD_PYWSMAN}" != xyes; then -- AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#amt_ws/fence_amt_ws.py( |$)##") -- AC_MSG_WARN("Not building fence_amt_ws") -- fi --fi -+#if echo "$AGENTS_LIST" | grep -q amt_ws; then -+# AC_PYTHON_MODULE(pywsman) -+# if test "x${HAVE_PYMOD_PYWSMAN}" != xyes; then -+# AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#amt_ws/fence_amt_ws.py( |$)##") -+# AC_MSG_WARN("Not building fence_amt_ws") -+# fi -+#fi - if echo "$AGENTS_LIST" | grep -q aws; then - AC_PYTHON_MODULE(boto3) - if test "x${HAVE_PYMOD_BOTO3}" != xyes; then --- -2.17.1 - diff --git a/fence-agents.changes b/fence-agents.changes index f2d71b6..e94ac86 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -9,6 +9,8 @@ Thu Aug 09 13:25:09 UTC 2018 - kgronlund@suse.com * fence_ilo3/fence_ipmilan: show correct default method (onoff) in help * fence_mpath: add watchdog support * fence_amt_ws: create metadata without agent specific libs +- Drop obsolete patch: + * Remove 0002-Build-without-openwsman-installed.patch ------------------------------------------------------------------- Wed Jun 27 07:38:02 UTC 2018 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 938f059..f400fc5 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -34,7 +34,6 @@ Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz Patch1: 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch -Patch2: 0002-Build-without-openwsman-installed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_version} @@ -126,8 +125,6 @@ development. %setup -q -n %{name}-%{version} %if %{python_version} == "python3" %patch1 -p1 -%else -%patch2 -p1 %endif %build