db0d731e53
* Improve obtaining status on Cisco UCS devices * Fix issues with symlink installations * Fix documentation for fence_scsi and fence_mpath OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=54
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From 93aab786cb3374b33a44433d845fe587262ee69d Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
Date: Wed, 29 Jun 2016 09:42:56 +0200
|
|
Subject: [PATCH 5/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 994aeb2..cb637e2 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.9.0
|
|
|