Skip to content

Commit

Permalink
Restore old behavior, and only provide all networks on creation for A…
Browse files Browse the repository at this point in the history
…PI 1.44+.
  • Loading branch information
felixfontein committed Jul 19, 2024
1 parent ebe2fd0 commit 07e4357
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
3 changes: 3 additions & 0 deletions plugins/module_utils/module_container/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,9 @@ def disconnect_container_from_network(self, client, container_id, network_id):
def connect_container_to_network(self, client, container_id, network_id, parameters=None):
pass

def create_container_supports_more_than_one_network(self, client):
return False

@abc.abstractmethod
def create_container(self, client, container_name, create_parameters, networks=None):
pass
Expand Down
3 changes: 3 additions & 0 deletions plugins/module_utils/module_container/docker_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ def connect_container_to_network(self, client, container_id, network_id, paramet
}
client.post_json('/networks/{0}/connect', network_id, data=data)

def create_container_supports_more_than_one_network(self, client):
return client.docker_api_version >= LooseVersion('1.44')

def create_container(self, client, container_name, create_parameters, networks=None):
params = {'name': container_name}
if 'platform' in create_parameters:
Expand Down
7 changes: 5 additions & 2 deletions plugins/module_utils/module_container/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,11 @@ def container_create(self, image):
self.log("image: %s parameters:" % image)
self.log(create_parameters, pretty_print=True)
networks = {}
if self.module.params['networks']:
for network in self.module.params['networks']:
if self.param_networks_cli_compatible and self.module.params['networks']:
network_list = self.module.params['networks']
if not self.engine_driver.create_container_supports_more_than_one_network(self.client):
network_list = network_list[:1]
for network in network_list:
networks[network['name']] = {
key: value for key, value in network.items()
if key not in ('name', 'id')
Expand Down

0 comments on commit 07e4357

Please sign in to comment.