ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-22 18:31:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Backport of https://github.com/ansible-collections/community.docker/pull/88 to stable-1. (#1982)

Browse source
This commit is contained in:
Felix Fontein 2021-03-08 08:37:10 +01:00 • committed by GitHub
parent 1e1a843ff3
commit a22113c3c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/modules/cloud/docker/docker_container.py
View file

@ -2293,6 +2293,12 @@ class Container(DockerBaseClass):
match = self._compare(getattr(self.parameters, key), value, compare)
if not match:
if key == 'expected_healthcheck' and config_mapping['disable_healthcheck'] and self.parameters.disable_healthcheck:
# If the healthcheck is disabled (both in parameters and for the current container), and the user
# requested strict comparison for healthcheck, the comparison will fail. That's why we ignore the
# expected_healthcheck comparison in this case.
continue
# no match. record the differences
p = getattr(self.parameters, key)
c = value