summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-04-07 23:52:48 +0000
committerTarmac <>2011-04-07 23:52:48 +0000
commitdf0e479e204ba5e4c2b01f59a2e7249bd780572e (patch)
tree26566a1470599e6b2f2dbbc21b8c56fdd21764a0 /nova/compute
parent25abb7036d96f41b3161fc8bd3df575c32493e67 (diff)
parent0c5f70c0bcf9395fb25a231057d997b075d04fda (diff)
Keep guest instances when libvirt host restarts
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 08b772517..bbc0e5f62 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1097,12 +1097,8 @@ class ComputeManager(manager.SchedulerDependentManager):
db_instance['id'],
vm_state)
- if vm_state == power_state.SHUTOFF:
- # TODO(soren): This is what the compute manager does when you
- # terminate an instance. At some point I figure we'll have a
- # "terminated" state and some sort of cleanup job that runs
- # occasionally, cleaning them out.
- self.db.instance_destroy(context, db_instance['id'])
+ # NOTE(justinsb): We no longer auto-remove SHUTOFF instances
+ # It's quite hard to get them back when we do.
# Are there VMs not in the DB?
for vm_not_found_in_db in vms_not_found_in_db: