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

Fixed #21464 - docker_network: TypeError with existing network (#24266)

Browse source 
Fixed #22530 - docker_network Failed but Overlay network created successfully on Docker swarm mode
This commit is contained in:
Nikolay Murga 2017-05-25 00:21:24 +03:00 committed by Toshio Kuratomi
parent cb3026f769
commit 3610a2457f
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/cloud/docker/docker_network.py
View file

@ -194,8 +194,7 @@ class TaskParameters(DockerBaseClass):
def container_names_in_network(network): def container_names_in_network(network):
return [c['Name'] for c in network['Containers'].values()] return [c['Name'] for c in network['Containers'].values()] if network['Containers'] else []
class DockerNetworkManager(object): class DockerNetworkManager(object):
@ -247,7 +246,7 @@ class DockerNetworkManager(object):
differences.append('driver_options') differences.append('driver_options')
else: else:
for key, value in self.parameters.driver_options.items(): for key, value in self.parameters.driver_options.items():
if not net['Options'].get(key) or value != net['Options'][key]: if not (key in net['Options']) or value != net['Options'][key]:
different = True different = True
differences.append('driver_options.%s' % key) differences.append('driver_options.%s' % key)
if self.parameters.ipam_driver: if self.parameters.ipam_driver:
@ -286,10 +285,10 @@ class DockerNetworkManager(object):
if HAS_DOCKER_PY_2: if HAS_DOCKER_PY_2:
ipam_config = IPAMConfig(driver=self.parameters.ipam_driver, ipam_config = IPAMConfig(driver=self.parameters.ipam_driver,
pool_configs=ipam_pools) pool_configs=ipam_pools)
else: else:
ipam_config = utils.create_ipam_config(driver=self.parameters.ipam_driver, ipam_config = utils.create_ipam_config(driver=self.parameters.ipam_driver,
pool_configs=ipam_pools) pool_configs=ipam_pools)
if not self.check_mode: if not self.check_mode:
resp = self.client.create_network(self.parameters.network_name, resp = self.client.create_network(self.parameters.network_name,
@ -321,13 +320,18 @@ class DockerNetworkManager(object):
self.results['changed'] = True self.results['changed'] = True
def disconnect_missing(self): def disconnect_missing(self):
for c in self.existing_network['Containers'].values(): containers = self.existing_network['Containers']
if not containers:
return
for c in containers.values():
name = c['Name'] name = c['Name']
if name not in self.parameters.connected: if name not in self.parameters.connected:
self.disconnect_container(name) self.disconnect_container(name)
def disconnect_all_containers(self): def disconnect_all_containers(self):
containers = self.client.inspect_network(self.parameters.network_name)['Containers'] containers = self.client.inspect_network(self.parameters.network_name)['Containers']
if not containers:
return
for cont in containers.values(): for cont in containers.values():
self.disconnect_container(cont['Name']) self.disconnect_container(cont['Name'])