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
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From 6e6bb16ef33121603b6c7b958a7c96ddc8424877 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
Date: Wed, 29 Jun 2016 09:42:56 +0200
|
|
Subject: [PATCH 3/9] fence_compute: Do not override domain if it is already
|
|
correct
|
|
|
|
---
|
|
fence/agents/compute/fence_compute.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
|
|
index e38c7bb..470fd07 100644
|
|
--- a/fence/agents/compute/fence_compute.py
|
|
+++ b/fence/agents/compute/fence_compute.py
|
|
@@ -254,8 +254,8 @@ def fix_domain(options):
|
|
options["--domain"] = last_domain
|
|
return options["--domain"]
|
|
|
|
- elif len(domains) == 1:
|
|
- logging.error("Overriding supplied domain '%s' does not match the one calculated from: %s"
|
|
+ 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"]
|
|
--
|
|
2.10.1
|
|
|