diff options
| author | Yun Mao <yunmao@gmail.com> | 2012-05-24 21:51:57 -0400 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2012-05-29 10:16:59 -0400 |
| commit | 5b85997e33aa749ece94edebaaefefe71b899561 (patch) | |
| tree | da5aedf4131803b153d2c4ed2fb76cf2d86aada1 /nova/scheduler | |
| parent | d7e613dabc2dbc28d9405a5b450dc2b4dfa9d47b (diff) | |
cleanup power state (partially implements bp task-management)
Removed duplicate and invalid state in power_state:
FAILED, SHUTOFF, BLOCKED
This is the first step in cleaning up nova state machine
and do better task management (bp/task-management)
http://wiki.openstack.org/VMState
Change-Id: I586b9058fada5efd468870fb187590fc0e37aa8f
Diffstat (limited to 'nova/scheduler')
| -rw-r--r-- | nova/scheduler/driver.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 8e49e5aa4..68cab5721 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -249,9 +249,7 @@ class Scheduler(object): """ # Checking instance is running. - if instance_ref['power_state'] != power_state.RUNNING and not ( - FLAGS.libvirt_type == 'xen' and - instance_ref['power_state'] == power_state.BLOCKED): + if instance_ref['power_state'] != power_state.RUNNING: raise exception.InstanceNotRunning( instance_id=instance_ref['uuid']) |