Allow for terminating paused/suspended instances

Fixes bug 1139288

Remove the restriction around terminating paused and suspended
instances, as Nova's API supports this transition and it works fine
for Libvirt/KVM.

Change-Id: Ic2fd9bffa63cb1543ee002bed9e8b68df0344da8
This commit is contained in:
Rafi Khardalian 2013-03-02 05:45:30 +00:00
parent db410ce91a
commit ab34fe5b9b

View File

@ -75,11 +75,6 @@ class TerminateInstance(tables.BatchAction):
classes = ('btn-danger', 'btn-terminate')
def allowed(self, request, instance=None):
if instance:
# FIXME(gabriel): This is true in Essex, but in FOLSOM an instance
# can be terminated in any state. We should improve this error
# handling when LP bug 1037241 is implemented.
return instance.status not in ("PAUSED", "SUSPENDED")
return True
def action(self, request, obj_id):