summaryrefslogtreecommitdiff
path: root/contrib/heat_docker/heat_docker/resources/docker_container.py
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/heat_docker/heat_docker/resources/docker_container.py')
-rw-r--r--contrib/heat_docker/heat_docker/resources/docker_container.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/heat_docker/heat_docker/resources/docker_container.py b/contrib/heat_docker/heat_docker/resources/docker_container.py
index a87fc6ec2..44144e772 100644
--- a/contrib/heat_docker/heat_docker/resources/docker_container.py
+++ b/contrib/heat_docker/heat_docker/resources/docker_container.py
@@ -495,11 +495,15 @@ class DockerContainer(resource.Resource):
return True
try:
status = self._get_container_status(container_id)
+ if not status['Running']:
+ client = self.get_client()
+ client.remove_container(container_id)
except docker.errors.APIError as ex:
if ex.response.status_code == 404:
return True
raise
- return (not status['Running'])
+
+ return False
def handle_suspend(self):
if not self.resource_id: