28 lines
1016 B
Diff
28 lines
1016 B
Diff
|
From 7f059392abfb5bb72f08747f1fd9c3456bd0c766 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vincent Untz <vuntz@suse.com>
|
||
|
|
Date: Wed, 3 Feb 2016 16:57:45 +0100
|
||
|
|
Subject: [PATCH 5/8] fence_compute: Evacuate instances on all tenants
|
||
|
|
|
||
|
|
We don't want to evacuate instances in just one tenant, so when we list
|
||
|
|
the instances, we need to look at all tenants, not just the current one.
|
||
|
|
---
|
||
|
|
fence/agents/compute/fence_compute.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
|
||
|
|
index feb86c0..be4d173 100644
|
||
|
|
--- a/fence/agents/compute/fence_compute.py
|
||
|
|
+++ b/fence/agents/compute/fence_compute.py
|
||
|
|
@@ -103,7 +103,7 @@ def _get_evacuable_images():
|
||
|
|
|
||
|
|
def _host_evacuate(options):
|
||
|
|
result = True
|
||
|
|
- servers = nova.servers.list(search_opts={'host': options["--plug"]})
|
||
|
|
+ servers = nova.servers.list(search_opts={'host': options["--plug"], 'all_tenants': 1})
|
||
|
|
if options["--instance-filtering"] == "False":
|
||
|
|
evacuables = servers
|
||
|
|
else:
|
||
|
|
--
|
||
|
|
2.6.2
|
||
|
|
|