29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
|
From 8cb524bea4a2e84787bddbcba9e42e9377d0c94c 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 f32c795..b0f3c2e 100644
|
||
|
|
--- a/fence/agents/compute/fence_compute.py
|
||
|
|
+++ b/fence/agents/compute/fence_compute.py
|
||
|
|
@@ -253,8 +253,8 @@ def fix_domain(options):
|
||
|
|
elif len(domains) == 1 and "--domain" not in options:
|
||
|
|
options["--domain"] = last_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
|
||
|
|
|
||
|
|
--
|
||
|
|
2.8.3
|
||
|
|
|