ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

docker_*: always use client.fail() over module.fail_json(), allow to always return data on failure (#51999)

Browse source 
* Always use client.fail() instead of module.fail_json().

* Allow to pass on results on module failure.

* Linting.
This commit is contained in:
Felix Fontein 2019-02-13 20:10:23 +01:00 • committed by ansibot
parent ad386290b4
commit d7fd4d0550
12 changed files with 64 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/cloud/docker/docker_swarm_service.py
View file

@ -1415,14 +1415,13 @@ class DockerServiceManager(object):
resolve=module.params['resolve_image']
)
except DockerException as e:
return module.fail_json(
msg="Error looking for an image named %s: %s" % (image, e))
self.client.fail(
"Error looking for an image named %s: %s" % (image, e))
try:
current_service = self.get_service(module.params['name'])
except Exception as e:
return module.fail_json(
msg='Error looking for service named %s: %s' %
(module.params['name'], e))
self.client.fail(
"Error looking for service named %s: %s" % (module.params['name'], e))
try:
new_service = DockerService.from_ansible_params(
module.params,
@ -1430,8 +1429,8 @@ class DockerServiceManager(object):
image_digest
)
except Exception as e:
return module.fail_json(
msg='Error parsing module parameters: %s' % e)
self.client.fail(
"Error parsing module parameters: %s" % e)
changed = False
msg = 'noop'