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

Fix #33045: get existing network via inspect_network (Rebased #33048) (#43997)

Browse source
This commit is contained in:
Valentin 2018-10-23 07:14:51 +02:00 committed by ansibot
parent bc741eb2a0
commit 2939f68897
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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):
'''