ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 20:01:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix purge_networks

Browse source
This commit is contained in:
Chris Houseknecht 2016-07-11 00:23:58 -04:00 • committed by Matt Clay
parent 66268dd3ec
commit dc496ffeb4
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1688,7 +1688,7 @@ class ContainerManager(DockerBaseClass):
if self.diff.get('differences'): if self.diff.get('differences'):
self.diff['differences'].append(dict(network_differences=network_differences)) self.diff['differences'].append(dict(network_differences=network_differences))
else: else:
self.diff['differences'] = dict(network_differences=network_differences) self.diff['differences'] = [dict(network_differences=network_differences)]
self.results['changed'] = True self.results['changed'] = True
updated_container = self._add_networks(container, network_differences) updated_container = self._add_networks(container, network_differences)
@ -1698,7 +1698,7 @@ class ContainerManager(DockerBaseClass):
if self.diff.get('differences'): if self.diff.get('differences'):
self.diff['differences'].append(dict(purge_networks=extra_networks)) self.diff['differences'].append(dict(purge_networks=extra_networks))
else: else:
self.diff['differences'] = dict(purge_networks=extra_networks) self.diff['differences'] = [dict(purge_networks=extra_networks)]
self.results['changed'] = True self.results['changed'] = True
updated_container = self._purge_networks(container, extra_networks) updated_container = self._purge_networks(container, extra_networks)
return updated_container return updated_container
@ -1734,7 +1734,7 @@ class ContainerManager(DockerBaseClass):
def _purge_networks(self, container, networks): def _purge_networks(self, container, networks):
for network in networks: for network in networks:
self.results['actions'].append(dict(removed_from_network=network['name'])) self.results['actions'].append(dict(removed_from_network=network['name']))
if not self.check_mode: if not self.check_mode and network.get('id'):
try: try:
self.client.disconnect_container_from_network(container.Id, network['id']) self.client.disconnect_container_from_network(container.Id, network['id'])
except Exception as exc: except Exception as exc: