commit d0ebd38ac5426fea162ec1aa9dad784338ec5a6a
author Zuul <zuul@review.opendev.org> Tue Mar 03 19:52:37 2020 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 03 19:52:37 2020 +0000
tree 50e6bdac4d9042ac3cade9fc7383ed5d53d88361
parent 8877c4e8919a150992941d0cc6a49227ec863fcc
parent 6e3f99e9d4ff079e6bb9bb6b121a4dc987046fe4

Merge "Do not force live migration outside of Availability zone"

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index d7ee39c..8d0962d 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -631,8 +631,14 @@
 
         svcs = self.os_admin.services_client.list_services(
             binary='nova-compute')['services']
-        hosts = [svc['host'] for svc in svcs
-                 if svc['state'] == 'up' and svc['status'] == 'enabled']
+        hosts = []
+        for svc in svcs:
+            if svc['state'] == 'up' and svc['status'] == 'enabled':
+                if CONF.compute.compute_volume_common_az:
+                    if svc['zone'] == CONF.compute.compute_volume_common_az:
+                        hosts.append(svc['host'])
+                else:
+                    hosts.append(svc['host'])
 
         for target_host in hosts:
             if source_host != target_host: