diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-25 19:02:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-25 19:02:34 +0000 |
| commit | f58fe27540e40af751d1ff77f04ec2b855138cc9 (patch) | |
| tree | 50770fd86361891e2c71031f972693b7b85a74f5 | |
| parent | cebdcf15d722b839fa9ecc411f5b368d8e7ecb93 (diff) | |
| parent | a72f25dba2cccbbcdd8c8927f0bc6199272b67ce (diff) | |
| download | nova-f58fe27540e40af751d1ff77f04ec2b855138cc9.tar.gz nova-f58fe27540e40af751d1ff77f04ec2b855138cc9.tar.xz nova-f58fe27540e40af751d1ff77f04ec2b855138cc9.zip | |
Merge "allow power state "BLOCKED" for live migrations if using Xen by libvirt"
| -rw-r--r-- | nova/scheduler/driver.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index ad83bc10a..d4ba58d6f 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -46,6 +46,7 @@ FLAGS = flags.FLAGS FLAGS.register_opts(scheduler_driver_opts) flags.DECLARE('instances_path', 'nova.compute.manager') +flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection') def cast_to_volume_host(context, host, method, update_db=True, **kwargs): @@ -247,7 +248,9 @@ class Scheduler(object): """ # Checking instance is running. - if instance_ref['power_state'] != power_state.RUNNING: + if instance_ref['power_state'] != power_state.RUNNING and not ( + FLAGS.libvirt_type == 'xen' and + instance_ref['power_state'] == power_state.BLOCKED): raise exception.InstanceNotRunning( instance_id=instance_ref['uuid']) |