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

docker_node_info: improve error handling (#63418)

Browse source 
* Improve error handling for get_service_inspect().

* Add changelog fragment.
This commit is contained in:
Felix Fontein 2019-10-13 14:16:02 +02:00 committed by GitHub
parent 7f643690c7
commit d753168e9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/63418-docker_node_info-errors.yml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- "docker_node_info - improve error handling when service inspection fails, for example because node name being ambiguous
(https://github.com/ansible/ansible/issues/63353, PR https://github.com/ansible/ansible/pull/63418)."

5
lib/ansible/module_utils/docker/swarm.py
View file

@ -164,10 +164,9 @@ class AnsibleDockerSwarmClient(AnsibleDockerClient):
if exc.status_code == 503: if exc.status_code == 503:
self.fail("Cannot inspect node: To inspect node execute module on Swarm Manager") self.fail("Cannot inspect node: To inspect node execute module on Swarm Manager")
if exc.status_code == 404: if exc.status_code == 404:
if skip_missing is False: if skip_missing:
self.fail("Error while reading from Swarm manager: %s" % to_native(exc))
else:
return None return None
self.fail("Error while reading from Swarm manager: %s" % to_native(exc))
except Exception as exc: except Exception as exc:
self.fail("Error inspecting swarm node: %s" % exc) self.fail("Error inspecting swarm node: %s" % exc)