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
|
||
|
|
|