summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorYun Mao <yunmao@gmail.com>2012-06-08 11:16:26 -0400
committerYun Mao <yunmao@gmail.com>2012-06-08 13:29:44 -0400
commit2d1d124982d3f67f587767012aaf260d9ddc217b (patch)
tree47ee2cfffada2afeb19674de36a396722bfadd5a /nova
parent01ad153b338c9df264e86b8211e82a811ae6332c (diff)
Fix power_state mis-use bug 1010586
SHUTDOWN and SHUTOFF are merged to SHUTDOWN in power state. Change-Id: If6a64076a3c23837ee18a34dcbd0a08fd46ab57f
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)