cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3944 from chouseknecht/devel

Browse source 
avoid removing attached containers by default
This commit is contained in:
Chris Houseknecht 2016-06-13 14:12:35 -04:00 committed by GitHub
commit 1a6fd35561
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cloud/docker/docker_container.py
View file

@ -1776,10 +1776,10 @@ class ContainerManager(DockerBaseClass):
self.fail("Error starting container %s: %s" % (container_id, str(exc)))
return self._get_container(container_id)
def container_remove(self, container_id, v=False, link=False, force=False):
volume_state = (True if self.parameters.keep_volumes else False)
self.log("remove container container:%s v:%s link:%s force%s" % (container_id, v, link, force))
self.results['actions'].append(dict(removed=container_id, volume_state=volume_state))
def container_remove(self, container_id, link=False, force=False):
volume_state = (not self.parameters.keep_volumes)
self.log("remove container container:%s v:%s link:%s force%s" % (container_id, volume_state, link, force))
self.results['actions'].append(dict(removed=container_id, volume_state=volume_state, link=link, force=force))
self.results['changed'] = True
response = None
if not self.check_mode: