From 2939f68897ed85b530249e9918eb0a6a9ef35ad4 Mon Sep 17 00:00:00 2001 From: Valentin Date: Tue, 23 Oct 2018 07:14:51 +0200 Subject: [PATCH] Fix #33045: get existing network via inspect_network (Rebased #33048) (#43997) --- lib/ansible/modules/cloud/docker/docker_network.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_network.py b/lib/ansible/modules/cloud/docker/docker_network.py index 069bfc03ed1..fa2590a71df 100644 --- a/lib/ansible/modules/cloud/docker/docker_network.py +++ b/lib/ansible/modules/cloud/docker/docker_network.py @@ -161,6 +161,7 @@ from ansible.module_utils.docker_common import AnsibleDockerClient, DockerBaseCl try: from docker import utils + from docker.errors import NotFound if HAS_DOCKER_PY_2 or HAS_DOCKER_PY_3: from docker.types import IPAMPool, IPAMConfig except Exception as dummy: @@ -215,14 +216,10 @@ class DockerNetworkManager(object): self.absent() def get_existing_network(self): - networks = self.client.networks(names=[self.parameters.network_name]) - # check if a user is trying to find network by its Id - if not networks: - networks = self.client.networks(ids=[self.parameters.network_name]) - if not networks: + try: + return self.client.inspect_network(self.parameters.network_name) + except NotFound: return None - else: - return networks[0] def has_different_config(self, net): '''