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

docker_container: fix container creation with networks_cli_compatible=yes (#56687)

Browse source 
* Fix behavior.

* Add changelog.

* Add simple test to prevent #56620.
This commit is contained in:
Felix Fontein 2019-05-28 09:19:52 +02:00 committed by ansibot
parent baac1df935
commit d8dcd20294
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56687-docker_container-networks_cli_compatible.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "docker_container - fix network creation when ``networks_cli_compatible`` is enabled."

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

@ -1282,7 +1282,7 @@ class TaskParameters(DockerBaseClass):
if network.get(para): if network.get(para):
params[para] = network[para] params[para] = network[para]
network_config = dict() network_config = dict()
network_config[network['name']] = self.client.create_endpoint_config(params) network_config[network['name']] = self.client.create_endpoint_config(**params)
result['networking_config'] = self.client.create_networking_config(network_config) result['networking_config'] = self.client.create_networking_config(network_config)
return result return result

3
test/integration/targets/docker_container/tasks/tests/network.yml
View file

@ -260,6 +260,9 @@
state: started state: started
networks: networks:
- name: "{{ nname_1 }}" - name: "{{ nname_1 }}"
aliases:
- alias1
- alias2
- name: "{{ nname_2 }}" - name: "{{ nname_2 }}"
networks_cli_compatible: yes networks_cli_compatible: yes
register: networks_1 register: networks_1