openstack/heat
Code Issues Proposed changes

Merge "ForceDelete Instance"

Browse Source
This commit is contained in:
Zuul 2017-12-18 05:46:11 +00:00 committed by Gerrit Code Review
commit f2b4007837
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/clients/os/nova.py
View File

@ -445,9 +445,12 @@ echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
return False return False
status = self.get_status(server) status = self.get_status(server)
if status in ("DELETED", "SOFT_DELETED"): if status == 'DELETED':
return True return True
if status == 'ERROR':
if status == 'SOFT_DELETED':
self.client().servers.force_delete(server_id)
elif status == 'ERROR':
fault = getattr(server, 'fault', {}) fault = getattr(server, 'fault', {})
message = fault.get('message', 'Unknown') message = fault.get('message', 'Unknown')
code = fault.get('code') code = fault.get('code')

2
heat/tests/openstack/nova/fakes.py
View File

@ -287,6 +287,8 @@ class FakeSessionClient(base_client.SessionClient):
assert set(body[action].keys()) == set(['host', assert set(body[action].keys()) == set(['host',
'block_migration', 'block_migration',
'disk_over_commit']) 'disk_over_commit'])
elif action == 'forceDelete':
assert body is not None
else: else:
raise AssertionError("Unexpected server action: %s" % action) raise AssertionError("Unexpected server action: %s" % action)
return (resp, _body) return (resp, _body)

9
releasenotes/notes/force-delete-nova-instance-6ed5d7fbd5b6f5fe.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- Force delete the nova instance.
If a resource is related with a nova instance which
is in 'SOFT_DELETED' status, the resource can't be
deleted, when nova config 'reclaim_instance_interval'.
so, force-delete the nova instance, and then all the
resources are related with the instance would be
processed properly.