9cf0a96d50
* A lot of changes in fence_compute (OpenStack compute instance) * Obtain status of nodes from Cisco UCS correctly * New fence agent for AMT using openwsman * Python3 support * Fence agent for PVE can be used by non-root users * Parallel building and testing of fence agents * Fix occasional failures of APC fence agent - Updated fence_compute patch set: - Add 0001-fence_compute-Create-nova-client-with-API-2.11.patch - Add 0002-fence_compute-Keep-compatibility-with-python-novacli.patch - Add 0003-fence_compute-Only-list-nova-compute-services-when-g.patch - Add 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch - Add 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch - Add 0006-fence_compute-Fix-use-of-undefined-variable.patch - Add 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch - Add 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch - Add 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch - Remove 0001-fence_compute-Add-insecure-command-line-argument.patch - Remove 0002-fence_compute-Add-region-name-command-line-argument.patch - Remove 0003-fence_compute-Create-nova-client-with-API-2.11.patch - Remove 0004-fence_compute-Fix-disabling-force_down-on-node-when-.patch - Remove 0005-fence_compute-Evacuate-instances-on-all-tenants.patch - Remove 0006-fence_compute-On-list-don-t-list-hypervisors-but-nov.patch - Remove 0007-fence_compute-Only-list-nova-compute-services-when-g.patch - Remove 0008-fence_compute-Deprecate-the-domain-option.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=52
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From 281bb6e1e842f298ff16f1e3cf5994c15d3ad1f3 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
Date: Wed, 29 Jun 2016 09:51:37 +0200
|
|
Subject: [PATCH 8/9] fence_compute: Fix fix_plug_name when looking if plug has
|
|
domain
|
|
|
|
We shouldn't check if the plug name contains the domain, but if it ends
|
|
with the domain.
|
|
---
|
|
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 3b0c729..b083660 100644
|
|
--- a/fence/agents/compute/fence_compute.py
|
|
+++ b/fence/agents/compute/fence_compute.py
|
|
@@ -281,8 +281,8 @@ def fix_plug_name(options):
|
|
# Ensure any domain is stripped off since nova isn't using FQDN
|
|
options["--plug"] = short_plug
|
|
|
|
- elif options["--plug"].find(options["--domain"]):
|
|
- # Plug already contains the domain, don't re-add
|
|
+ elif options["--plug"].endswith(options["--domain"]):
|
|
+ # Plug already uses the domain, don't re-add
|
|
return
|
|
|
|
else:
|
|
--
|
|
2.8.3
|
|
|