Removed commented-out old 'delete instance on SHUTOFF' code

2 files changed, 1 insertions, 13 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 72f04ecb1..d3cd2e51a 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1090,12 +1090,6 @@ class ComputeManager(manager.SchedulerDependentManager):
 
             # NOTE(justinsb): We no longer auto-remove SHUTOFF instances
             # It's quite hard to get them back when we do.
-            #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'])
 
         # Are there VMs not in the DB?
         for vm_not_found_in_db in vms_not_found_in_db:
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 533ff9394..4523cdd2f 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -232,14 +232,8 @@ class LibvirtConnection(driver.ComputeDriver):
                           {'name': instance['name'], 'state': state})
             db.instance_set_state(ctxt, instance['id'], state)
 
-            # NOTE(justinsb): We no longer delete these instances,
+            # NOTE(justinsb): We no longer delete SHUTOFF instances,
             # the user may want to power them back on
-            #if 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.
-            #    db.instance_destroy(ctxt, instance['id'])
 
             if state != power_state.RUNNING:
                 continue