Accepting request 628434 from network:ha-clustering:Factory
- 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 - Drop obsolete patch: * Remove 0002-Build-without-openwsman-installed.patch OBS-URL: https://build.opensuse.org/request/show/628434 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fence-agents?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
50c509af13
@ -1,108 +0,0 @@
|
||||
From 36fe441cda4f59400b18f558a668d025123b1129 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
|
||||
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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/ClusterLabs/fence-agents.git</param>
|
||||
<param name="changesrevision">9b763accb5c4c4a1cf60a19592a4033bcedec500</param></service></servicedata>
|
||||
<param name="changesrevision">790cbaa66f3927a84739af4a1f0e8bba295cdc36</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eafd2de2c6caa66fe49df43b1764f3cb261adcaf71b4bdbf15032ced449817b3
|
||||
size 228396
|
||||
3
fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz
Normal file
3
fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:901ac23fdd4eacc00143c2d37362bc7069d9930c0fc1bfefed55ded7abda30f4
|
||||
size 230288
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
- Drop obsolete patch:
|
||||
* Remove 0002-Build-without-openwsman-installed.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 27 07:38:02 UTC 2018 - kgronlund@suse.com
|
||||
|
||||
|
||||
@ -29,12 +29,11 @@ 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
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user