internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker_container: fix check mode for container creation (#42380)

Browse Source 
* Create copy of HostConfig object before adding it to results.

* Create general sanitize function in docker_common. Using it for all return values of docker_container.

* Make Python 2.6 compatible.
This commit is contained in:
Felix Fontein
2018-08-28 13:03:33 +02:00
committed by John R Barker
parent 047fddfe86
commit fabba43da7
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker_container.py
View File

@@ -634,7 +634,7 @@ import shlex
from distutils.version import LooseVersion
from ansible.module_utils.basic import human_to_bytes
from ansible.module_utils.docker_common import HAS_DOCKER_PY_2, HAS_DOCKER_PY_3, AnsibleDockerClient, DockerBaseClass
from ansible.module_utils.docker_common import HAS_DOCKER_PY_2, HAS_DOCKER_PY_3, AnsibleDockerClient, DockerBaseClass, sanitize_result
from ansible.module_utils.six import string_types
try:
@@ -1817,7 +1817,7 @@ class ContainerManager(DockerBaseClass):
self.container_remove(container.Id)
def fail(self, msg, **kwargs):
self.client.module.fail_json(msg=msg, **kwargs)
self.client.module.fail_json(msg=msg, **sanitize_result(kwargs))
def _output_logs(self, msg):
self.client.module.log(msg=msg)
@@ -2149,7 +2149,7 @@ def main():
)
cm = ContainerManager(client)
client.module.exit_json(**cm.results)
client.module.exit_json(**sanitize_result(cm.results))
if __name__ == '__main__':