File 0003-fence_compute-Do-not-override-domain-if-it... of Package fence-agents

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch of Package fence-agents (Revision 6266fb3223397c13c045b32d60470ad4)

Currently displaying revision 6266fb3223397c13c045b32d60470ad4 , Show latest

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

Places

File 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch of Package fence-agents (Revision 6266fb3223397c13c045b32d60470ad4)

Places