x/kolla-mesos
Code Issues Proposed changes

Fix cleanup with empty volumes

Browse Source 
TrivialFix

Change-Id: I7b23bf6793cfb0c2b552cfc5b255ebf67eaa4fec
This commit is contained in:
Proskurin Kirill 2016-02-20 19:06:18 +03:00
parent af51dca89d
commit 735209c105
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kolla_mesos/cleanup.py
View File

@ -108,14 +108,17 @@ def remove_all_containers():
@docker_utils.DockerClient()
def remove_all_volumes(dc):
"""Remove all volumes created for containers run by Mesos."""
volume_names = six.moves.map(operator.itemgetter('Name'),
dc.volumes()['Volumes'])
for volume_name in volume_names:
# TODO(nihilifer): Provide a more intelligent filtering for Mesos infra
# volumes.
if 'zookeeper' not in volume_name:
LOG.info("Removing volume %s", volume_name)
dc.remove_volume(volume_name)
if dc.volumes()['Volumes'] is not None:
volume_names = six.moves.map(operator.itemgetter('Name'),
dc.volumes()['Volumes'])
for volume_name in volume_names:
# TODO(nihilifer): Provide a more intelligent filtering for Mesos
# infra volumes.
if 'zookeeper' not in volume_name:
LOG.info("Removing volume %s", volume_name)
dc.remove_volume(volume_name)
else:
LOG.info("No docker volumes found")
def cleanup():