summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-29 21:37:10 +0000
committerGerrit Code Review <review@openstack.org>2012-02-29 21:37:10 +0000
commiteb9b2b6e0eb3e24569ad5dd7808ad22d5049c924 (patch)
tree9eb144ee4095a8de9d9fdb49fcd9093e844d8b22
parentdffef53503a30eab271639ce06366cec2af1ecbe (diff)
parent8a143d3a5ba4f2b2cd1c8a0a95cb0233083d0f8a (diff)
downloadnova-eb9b2b6e0eb3e24569ad5dd7808ad22d5049c924.tar.gz
nova-eb9b2b6e0eb3e24569ad5dd7808ad22d5049c924.tar.xz
nova-eb9b2b6e0eb3e24569ad5dd7808ad22d5049c924.zip
Merge "Fix _sync_power_states to obtain correct 'state'."
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index d06786ca0..a4a18f1f8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2244,7 +2244,7 @@ class ComputeManager(manager.SchedulerDependentManager):
db_power_state = db_instance['power_state']
try:
vm_instance = self.driver.get_info(db_instance)
- vm_power_state = vm_instance.state
+ vm_power_state = vm_instance['state']
except exception.InstanceNotFound:
LOG.warn(_("Instance found in database but not known by "
"hypervisor. Setting power state to NOSTATE"),