88cb20e9f5
+ fence_cisco_ucs: Obtain status of device from different endpoint + fence_cisco_ucs: Add --missing-as-off - Patches for fence_compute (fate#320346) - fence_compute: Add --insecure command line argument - fence_compute: Add --region-name command line argument - fence_compute: Create nova client with API 2.11 - fence_compute: Fix disabling force_down on node when action is on - fence_compute: Evacuate instances on all tenants - fence_compute: On list, don't list hypervisors but nova-compute services - fence_compute: Only list nova-compute services when getting status - fence_compute: Deprecate the domain option - Add 0001-fence_compute-Add-insecure-command-line-argument.patch - Add 0002-fence_compute-Add-region-name-command-line-argument.patch - Add 0003-fence_compute-Create-nova-client-with-API-2.11.patch - Add 0004-fence_compute-Fix-disabling-force_down-on-node-when-.patch - Add 0005-fence_compute-Evacuate-instances-on-all-tenants.patch - Add 0006-fence_compute-On-list-don-t-list-hypervisors-but-nov.patch - Add 0007-fence_compute-Only-list-nova-compute-services-when-g.patch - Add 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=49
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From a1f665a1f3da3afd94d9888432579ecea7c3bfbf Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
Date: Thu, 4 Feb 2016 09:59:43 +0100
|
|
Subject: [PATCH 6/8] fence_compute: On list, don't list hypervisors but
|
|
nova-compute services
|
|
|
|
Everything we do (evacuate, force_down) is on nova-compute services, so
|
|
there's no reason to list hypervisors; just directly look for
|
|
nova-compute services.
|
|
---
|
|
fence/agents/compute/fence_compute.py | 12 +++---------
|
|
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
|
|
index be4d173..7d7aa49 100644
|
|
--- a/fence/agents/compute/fence_compute.py
|
|
+++ b/fence/agents/compute/fence_compute.py
|
|
@@ -202,15 +202,9 @@ def get_plugs_list(_, options):
|
|
result = {}
|
|
|
|
if nova:
|
|
- hypervisors = nova.hypervisors.list()
|
|
- for hypervisor in hypervisors:
|
|
- longhost = hypervisor.hypervisor_hostname
|
|
- if options["--domain"] != "":
|
|
- shorthost = longhost.replace("." + options["--domain"], "")
|
|
- result[longhost] = ("", None)
|
|
- result[shorthost] = ("", None)
|
|
- else:
|
|
- result[longhost] = ("", None)
|
|
+ services = nova.services.list(binary="nova-compute")
|
|
+ for service in services:
|
|
+ result[service.host] = ("", None)
|
|
return result
|
|
|
|
|
|
--
|
|
2.6.2
|
|
|