Merge "Fix Compute Live Migration tests with Ironic"
This commit is contained in:
commit
cd354d8ce3
@ -698,6 +698,8 @@ class BaseV2ComputeAdminTest(BaseV2ComputeTest):
|
|||||||
binary='nova-compute')['services']
|
binary='nova-compute')['services']
|
||||||
hosts = []
|
hosts = []
|
||||||
for svc in svcs:
|
for svc in svcs:
|
||||||
|
if svc['host'].endswith('-ironic'):
|
||||||
|
continue
|
||||||
if svc['state'] == 'up' and svc['status'] == 'enabled':
|
if svc['state'] == 'up' and svc['status'] == 'enabled':
|
||||||
if CONF.compute.compute_volume_common_az:
|
if CONF.compute.compute_volume_common_az:
|
||||||
if svc['zone'] == CONF.compute.compute_volume_common_az:
|
if svc['zone'] == CONF.compute.compute_volume_common_az:
|
||||||
|
Loading…
Reference in New Issue
Block a user