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

Purge networks using network name rather than ID. Fixes 4596.

Browse source
This commit is contained in:
Chris Houseknecht 2016-09-10 00:45:51 -04:00 committed by Matt Clay
parent 890c2d04e2
commit 05303a974d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -1767,9 +1767,9 @@ class ContainerManager(DockerBaseClass):
def _purge_networks(self, container, networks):
for network in networks:
self.results['actions'].append(dict(removed_from_network=network['name']))
if not self.check_mode and network.get('id'):
if not self.check_mode:
try:
self.client.disconnect_container_from_network(container.Id, network['id'])
self.client.disconnect_container_from_network(container.Id, network['name'])
except Exception as exc:
self.fail("Error disconnecting container from network %s - %s" % (network['name'],
str(exc)))