From 5b85997e33aa749ece94edebaaefefe71b899561 Mon Sep 17 00:00:00 2001 From: Yun Mao Date: Thu, 24 May 2012 21:51:57 -0400 Subject: 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 --- nova/scheduler/driver.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'nova/scheduler') 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']) -- cgit