From 2d1d124982d3f67f587767012aaf260d9ddc217b Mon Sep 17 00:00:00 2001
From: Yun Mao <yunmao@gmail.com>
Date: Fri, 8 Jun 2012 11:16:26 -0400
Subject: Fix power_state mis-use bug 1010586

SHUTDOWN and SHUTOFF are merged to SHUTDOWN in power state.

Change-Id: If6a64076a3c23837ee18a34dcbd0a08fd46ab57f
---
 nova/virt/libvirt/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

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)
-- 
cgit