ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-01 14:51:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

docker modules: make sure everything works with older docker-py versions (#55258)

Browse source 
* General test improvements.

* Adjust tests to older docker-py versions.

* docker_swarm_server_info: work around problems with older docker-py versions

* Bump minimal docker-py version for options network_filters and disk_usage.

* More general test improvements.

* Correct usage of docker_image.

* Put files into output directory.

* Speed up test.

* Remove old check.
This commit is contained in:
Felix Fontein 2019-04-17 19:50:57 +02:00 • committed by ansibot
parent 24b44e1772
commit 12d26eceb1
20 changed files with 119 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/cloud/docker/docker_host_info.py
View file

@ -245,15 +245,18 @@ class DockerHostManager(DockerBaseClass):
header_images = ['Id', 'RepoTags', 'Created', 'Size']
header_networks = ['Id', 'Driver', 'Name', 'Scope']
filter_arg = dict()
if filters:
filter_arg['filters'] = filters
try:
if docker_object == 'containers':
items = self.client.containers(filters=filters)
items = self.client.containers(**filter_arg)
elif docker_object == 'networks':
items = self.client.networks(filters=filters)
items = self.client.networks(**filter_arg)
elif docker_object == 'images':
items = self.client.images(filters=filters)
items = self.client.images(**filter_arg)
elif docker_object == 'volumes':
items = self.client.volumes(filters=filters)
items = self.client.volumes(**filter_arg)
except APIError as exc:
self.client.fail("Error inspecting docker host for object '%s': %s" %
(docker_object, to_native(exc)))
@ -301,11 +304,17 @@ def main():
verbose_output=dict(type='bool', default=False),
)
option_minimal_versions = dict(
network_filters=dict(docker_py_version='2.0.2'),
disk_usage=dict(docker_py_version='2.2.0'),
)
client = AnsibleDockerClient(
argument_spec=argument_spec,
supports_check_mode=True,
min_docker_version='1.10.0',
min_docker_api_version='1.21',
option_minimal_versions=option_minimal_versions,
fail_results=dict(
can_talk_to_docker=False,
),