diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-04-07 17:59:10 -0700 |
|---|---|---|
| committer | Ken Pepple <ken.pepple@gmail.com> | 2011-04-07 17:59:10 -0700 |
| commit | e892deef8ba1f6c424dd8fa3fc6330d09245c89e (patch) | |
| tree | 5c03f99f22db81bd5f46b4f94e2cfc57c26db6c5 /nova/compute | |
| parent | 86ffed4e988025023b570b9e6e87f89b6075c7b0 (diff) | |
| parent | 4d8594cd7e36983cb55908ab8bfebe8aa3a40ff1 (diff) | |
merge trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 8 |
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: |