diff options
author | Chris Houseknecht <chouseknecht@ansible.com> | 2016-06-13 18:11:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-13 18:11:15 -0400 |
commit | b8a8f1ddcd215c9275c54b4114b72e2cd3c02b89 (patch) | |
tree | cba81ccaeff5e4e13f452aa1c3692014c1dfc6c8 | |
parent | 46d6bead71caca4af52671ce3532f65f407312f6 (diff) | |
download | ansible-modules-core-revert-3944-devel.tar.gz |
Revert "avoid removing attached containers by default"revert-3944-devel
-rw-r--r-- | cloud/docker/docker_container.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloud/docker/docker_container.py b/cloud/docker/docker_container.py index 2e602864..e9afaa37 100644 --- a/cloud/docker/docker_container.py +++ b/cloud/docker/docker_container.py @@ -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, 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)) + 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)) self.results['changed'] = True response = None if not self.check_mode: |