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

Fix ansible-test docker container IP detection.

Browse source
This commit is contained in:
Matt Clay 2021-04-22 10:18:23 -07:00
parent 6119fb0a9a
commit 14ff5e213c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ansible-test-docker-network-detect.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ansible-test - Fix docker container IP address detection. The ``bridge`` network is no longer assumed to be the default.

8
test/lib/ansible_test/_internal/docker_util.py
View file

@ -423,7 +423,13 @@ class DockerInspect:
def get_ip_address(self): # type: () -> t.Optional[str] def get_ip_address(self): # type: () -> t.Optional[str]
"""Return the IP address of the container for the preferred docker network.""" """Return the IP address of the container for the preferred docker network."""
if self.networks: if self.networks:
network_name = get_docker_preferred_network_name(self.args) or 'bridge' network_name = get_docker_preferred_network_name(self.args)
if not network_name:
# Sort networks and use the first available.
# This assumes all containers will have access to the same networks.
network_name = sorted(self.networks.keys()).pop(0)
ipaddress = self.networks[network_name]['IPAddress'] ipaddress = self.networks[network_name]['IPAddress']
else: else:
ipaddress = self.network_settings['IPAddress'] ipaddress = self.network_settings['IPAddress']