summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-10 20:44:11 +0000
committerGerrit Code Review <review@openstack.org>2012-06-10 20:44:11 +0000
commit168a8a15bea6ee755219f9471ac790e40942e77d (patch)
tree28e0557ea932bd43b210badb1a4f5360254b033e /nova
parent7e3f593e11f7cf8f47d3fafba94b451caa58df3d (diff)
parent2d1d124982d3f67f587767012aaf260d9ddc217b (diff)
Merge "Fix power_state mis-use bug 1010586"
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/libvirt/connection.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index fb14dc756..24e08cc12 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -438,7 +438,7 @@ class LibvirtDriver(driver.ComputeDriver):
instance=instance)
raise utils.LoopingCallDone(False)
- if state == power_state.SHUTOFF:
+ if state == power_state.SHUTDOWN:
LOG.info(_("Instance destroyed successfully."),
instance=instance)
raise utils.LoopingCallDone(True)