summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-21 21:47:13 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-21 21:47:13 +0000
commitf0195ebfd2cc56cee5797fff19fb9702c51df51b (patch)
treec5a366844c570953ac10fd99fd7d1ea6405b8db3 /nova/virt
parent9d40ff49f6b4a840e2528edf187725ef2a60b246 (diff)
downloadnova-f0195ebfd2cc56cee5797fff19fb9702c51df51b.tar.gz
nova-f0195ebfd2cc56cee5797fff19fb9702c51df51b.tar.xz
nova-f0195ebfd2cc56cee5797fff19fb9702c51df51b.zip
fix reboot command to work even if a host is rebooted
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt_conn.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index ad101db2a..845167d9f 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -40,6 +40,7 @@ import logging
import os
import shutil
+from eventlet import greenthread
from eventlet import event
from eventlet import tpool
@@ -183,7 +184,8 @@ class LibvirtConnection(object):
# everything has been vetted a bit
def _wait_for_timer():
timer_done.wait()
- self._cleanup(instance)
+ if cleanup:
+ self._cleanup(instance)
done.send()
greenthread.spawn(_wait_for_timer)