diff options
| author | Chris Houseknecht <chouseknecht@ansible.com> | 2016-06-13 14:12:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 14:12:35 -0400 |
| commit | 1a6fd35561081e5acb2aa401b373209e354d8107 (patch) | |
| tree | fbe0de9f7abbc6e10e9821babca9c4177dfebf68 | |
| parent | d6f01d0b4facca555a161e995b513d44ed76868f (diff) | |
| parent | af8eabe06f43523c0674c8f220fc0f91d76574dd (diff) | |
| download | ansible-modules-core-1a6fd35561081e5acb2aa401b373209e354d8107.tar.gz | |
Merge pull request #3944 from chouseknecht/devel
avoid removing attached containers by default
| -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 e9afaa37..2e602864 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, 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: |