Hello community,
here is the log from the commit of package fence-agents for openSUSE:Factory checked in at 2016-12-03 18:27:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fence-agents (Old)
and /work/SRC/openSUSE:Factory/.fence-agents.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fence-agents"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fence-agents/fence-agents.changes 2016-08-29 15:45:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fence-agents.new/fence-agents.changes 2016-12-03 18:27:17.000000000 +0100
@@ -1,0 +2,36 @@
+Thu Dec 01 11:38:47 UTC 2016 - kgronlund@suse.com
+
+- Update to version 4.0.24+git.1480563949.e67fcd4:
+ * fence_azure_arm: add fencing agent for Azure Resource Manager
+ * fence_lpar: Add support for IVM
+ * fence_lpar: Handle exceptions when invalid output is read
+ * fence_zvmip: Update XML metadata
+ * fence_compute: fix ConnectionError by using full module name
+ * fence_powerman: add fence agent for powerman
+ * Suppress InsecureRequestWarning when ssl_insecure is given
+ * compute: Correctly handle installations without tagged flavours
+ * compute: Use the best available nova API version
+ * compute: correctly implement 'on' when the force-down API call is available
+ * compute: Correctly identify when the nodename already includes the supplied domain
+ * compute: Ensure we can connect to nova when fixing the plug name
+ * compute: Simpler check for nova force down compatibility
+
+- Rebase and remove merged patches:
+ * Remove 0001-fence_compute-Create-nova-client-with-API-2.11.patch
+ * Remove 0002-fence_compute-Keep-compatibility-with-python-novacli.patch
+ * Remove 0003-fence_compute-Only-list-nova-compute-services-when-g.patch
+ * Remove 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
+ * Remove 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch
+ * Remove 0006-fence_compute-Fix-use-of-undefined-variable.patch
+ * Remove 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
+ * Remove 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
+ * Add 0001-fence_compute-Only-list-nova-compute-services-when-g.patch
+ * Add 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
+ * Add 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch
+ * Add 0004-fence_compute-Fix-handling-of-domain-None.patch
+ * Add 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
+ * Add 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
+ * Add 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch
+ * Add 0008-Fix-travis.patch
+
+-------------------------------------------------------------------
Old:
----
0001-fence_compute-Create-nova-client-with-API-2.11.patch
0002-fence_compute-Keep-compatibility-with-python-novacli.patch
0003-fence_compute-Only-list-nova-compute-services-when-g.patch
0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch
0006-fence_compute-Fix-use-of-undefined-variable.patch
0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
fence-agents-4.0.24.tar.gz
New:
----
0001-fence_compute-Only-list-nova-compute-services-when-g.patch
0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch
0004-fence_compute-Fix-handling-of-domain-None.patch
0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
0007-fence_compute-Remove-duplicate-check-for-binary-name.patch
0008-Fix-travis.patch
fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fence-agents.spec ++++++
--- /var/tmp/diff_new_pack.oKkPuy/_old 2016-12-03 18:27:19.000000000 +0100
+++ /var/tmp/diff_new_pack.oKkPuy/_new 2016-12-03 18:27:19.000000000 +0100
@@ -22,26 +22,26 @@
Summary: Fence Agents for Pacemaker from RHCS
License: GPL-2.0 and LGPL-2.1
Group: Productivity/Clustering/HA
-Version: 4.0.24
+Version: 4.0.24+git.1480563949.e67fcd4
Release: 0
Url: https://github.com/ClusterLabs/fence-agents
-Source0: %{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM: fence_compute: Create nova client with API 2.11
-Patch1: 0001-fence_compute-Create-nova-client-with-API-2.11.patch
-# PATCH-FIX-UPSTREAM: fence_compute: Keep compatibility with python-novaclient <= 2.26.0
-Patch2: 0002-fence_compute-Keep-compatibility-with-python-novacli.patch
+Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM: fence_compute: Only list nova-compute services when getting status
-Patch3: 0003-fence_compute-Only-list-nova-compute-services-when-g.patch
+Patch1: 0001-fence_compute-Only-list-nova-compute-services-when-g.patch
# PATCH-FIX-UPSTREAM: fence_compute: On list, don't list hypervisors but nova-compute services
-Patch4: 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
+Patch2: 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
# PATCH-FIX-UPSTREAM: fence_compute: Do not override domain if it is already correct
-Patch5: 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch
-# PATCH-FIX-UPSTREAM: fence_compute: Fix use of undefined variable
-Patch6: 0006-fence_compute-Fix-use-of-undefined-variable.patch
+Patch3: 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch
+# PATCH-FIX-UPSTREAM: fence_compute: Fix handling of domain == None
+Patch4: 0004-fence_compute-Fix-handling-of-domain-None.patch
# PATCH-FIX-UPSTREAM: fence_compute: Fix fix_domain to not return too early
-Patch7: 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
+Patch5: 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
# PATCH-FIX-UPSTREAM: fence_compute: Fix fix_plug_name when looking if plug has domain
-Patch8: 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
+Patch6: 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
+# PATCH-FIX-UPSTREAM: fence_compute: Remove duplicate check for binary name
+Patch7: 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch
+# PATCH-FIX-UPSTREAM: Fix travis regression
+Patch8: 0008-Fix-travis.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
++++++ 0003-fence_compute-Only-list-nova-compute-services-when-g.patch -> 0001-fence_compute-Only-list-nova-compute-services-when-g.patch ++++++
--- /work/SRC/openSUSE:Factory/fence-agents/0003-fence_compute-Only-list-nova-compute-services-when-g.patch 2016-08-29 15:45:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fence-agents.new/0001-fence_compute-Only-list-nova-compute-services-when-g.patch 2016-12-03 18:27:17.000000000 +0100
@@ -1,7 +1,7 @@
-From 99ef77ee94d43545473281c017dc1a0189a467fe Mon Sep 17 00:00:00 2001
+From b6558964430c579b8a881807f43ec61fd38cd31b Mon Sep 17 00:00:00 2001
From: Vincent Untz
From 952c40fb84b182c3600f781ed6fe6373012424ef Mon Sep 17 00:00:00 2001 From: Vincent Untz
Date: Wed, 29 Jun 2016 09:43:57 +0200 Subject: [PATCH 4/9] fence_compute: Fix handling of domain == None
---
fence/agents/compute/fence_compute.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
index 470fd07..3c19f02 100644
--- a/fence/agents/compute/fence_compute.py
+++ b/fence/agents/compute/fence_compute.py
@@ -252,20 +252,18 @@ def fix_domain(options):
elif len(domains) == 1 and "--domain" not in options:
options["--domain"] = last_domain
- return options["--domain"]
elif len(domains) == 1 and options["--domain"] != last_domain:
logging.error("Overriding supplied domain '%s' as it does not match the one calculated from: %s"
% (options["--domain"], service.host))
options["--domain"] = last_domain
- return options["--domain"]
elif len(domains) > 1:
logging.error("The supplied domain '%s' did not match any used inside nova: %s"
% (options["--domain"], repr(domains)))
sys.exit(1)
- return None
+ return last_domain
def fix_plug_name(options):
if options["--action"] == "list":
@@ -275,14 +273,15 @@ def fix_plug_name(options):
return
calculated = fix_domain(options)
- short_plug = options["--plug"].split('.')[0]
- logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], options["--domain"]))
- if "--domain" not in options:
+ if calculated is None or "--domain" not in options:
# Nothing supplied and nova not available... what to do... nothing
return
- elif options["--domain"] == "":
+ short_plug = options["--plug"].split('.')[0]
+ logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], calculated))
+
+ if options["--domain"] == "":
# Ensure any domain is stripped off since nova isn't using FQDN
options["--plug"] = short_plug
--
2.10.1
++++++ 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch -> 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch ++++++
--- /work/SRC/openSUSE:Factory/fence-agents/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch 2016-08-29 15:45:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fence-agents.new/0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch 2016-12-03 18:27:17.000000000 +0100
@@ -1,7 +1,7 @@
-From 160e505367c30d1f8ba045fc1b3ab47bf09176ad Mon Sep 17 00:00:00 2001
+From 02a40aed59e4d6bb48ccd28e7558d18b0d03e7c0 Mon Sep 17 00:00:00 2001
From: Vincent Untz
From 06c939730ccfcdef24370b09066a718e85f9dddc Mon Sep 17 00:00:00 2001 From: Vincent Untz
Date: Tue, 18 Oct 2016 16:35:52 +0200 Subject: [PATCH 7/9] fence_compute: Remove duplicate check for binary name
We already do the filtering on the server side. --- fence/agents/compute/fence_compute.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py index 0cdf685..cb7dfe3 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -37,14 +37,13 @@ def get_power_status(_, options): services = nova.services.list(host=options["--plug"], binary="nova-compute") for service in services: logging.debug("Status of %s is %s" % (service.binary, service.state)) - if service.binary == "nova-compute": - if service.state == "up": - status = "on" - elif service.state == "down": - status = "off" - else: - logging.debug("Unknown status detected from nova: " + service.state) - break + if service.state == "up": + status = "on" + elif service.state == "down": + status = "off" + else: + logging.debug("Unknown status detected from nova: " + service.state) + break except requests.exception.ConnectionError as err: logging.warning("Nova connection failed: " + str(err)) return status -- 2.10.1 ++++++ 0008-Fix-travis.patch ++++++
From 20aa88df8d23b88bdb8d500bec9c8a9ea4ae2232 Mon Sep 17 00:00:00 2001 From: Vincent Untz
Date: Thu, 1 Dec 2016 14:04:19 +0100 Subject: [PATCH 8/9] Fix travis
Regression introduced in 0f170a937bd0944e172004dc30df2fc240d9ca20
---
tests/data/metadata/fence_compute.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
index 83bdb53..58f77a6 100644
--- a/tests/data/metadata/fence_compute.xml
+++ b/tests/data/metadata/fence_compute.xml
@@ -9,7 +9,7 @@
<shortdesc lang="en">Fencing action</shortdesc>
</parameter>
<parameter name="auth-url" unique="0" required="0">
- <getopt mixed="-k, --auth-url=[tenant]" />
+ <getopt mixed="-k, --auth-url=[url]" />
<content type="string" default="" />
<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
</parameter>
--
2.10.1
++++++ 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch ++++++
--- /var/tmp/diff_new_pack.oKkPuy/_old 2016-12-03 18:27:19.000000000 +0100
+++ /var/tmp/diff_new_pack.oKkPuy/_new 2016-12-03 18:27:19.000000000 +0100
@@ -1,4 +1,4 @@
-From 2d7e1008a79627a8bab30d400dd6403adcd30e93 Mon Sep 17 00:00:00 2001
+From 6d2776559a5bb11b83e9703bed2aeec681207b78 Mon Sep 17 00:00:00 2001
From: Vincent Untz