0876d5cd99
* 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 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=56
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 06c939730ccfcdef24370b09066a718e85f9dddc Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
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
|
|
|