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
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 6da3804b866168e23509c6d1f251194c5d205a3c Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
Date: Wed, 29 Jun 2016 09:43:57 +0200
|
|
Subject: [PATCH 6/9] fence_compute: Fix use of undefined variable
|
|
|
|
---
|
|
fence/agents/compute/fence_compute.py | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
|
|
index cb637e2..37f48ee 100644
|
|
--- a/fence/agents/compute/fence_compute.py
|
|
+++ b/fence/agents/compute/fence_compute.py
|
|
@@ -275,14 +275,15 @@ def fix_plug_name(options):
|
|
return
|
|
|
|
calculated = fix_domain(options)
|
|
+
|
|
+ if calculated is None or "--domain" not in options:
|
|
+ # Nothing supplied and nova not available... what to do... nothing
|
|
+ return
|
|
+
|
|
short_plug = options["--plug"].split('.')[0]
|
|
logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], calculated))
|
|
|
|
- if "--domain" not in options:
|
|
- # Nothing supplied and nova not available... what to do... nothing
|
|
- return
|
|
-
|
|
- elif options["--domain"] == "":
|
|
+ if options["--domain"] == "":
|
|
# Ensure any domain is stripped off since nova isn't using FQDN
|
|
options["--plug"] = short_plug
|
|
|
|
--
|
|
2.9.0
|
|
|