From 5d23406926d789a7ff55601f4890f95ab38b28ab Mon Sep 17 00:00:00 2001 From: Thierry Bouvet Date: Fri, 20 Jul 2018 17:32:04 +0200 Subject: [PATCH] Fix ssl_version default value. (#42955) * Fix ssl_version default value. * Add changelog --- changelogs/fragments/docker-default-ssl.yml | 3 +++ lib/ansible/module_utils/docker_common.py | 3 +-- lib/ansible/utils/module_docs_fragments/docker.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/docker-default-ssl.yml diff --git a/changelogs/fragments/docker-default-ssl.yml b/changelogs/fragments/docker-default-ssl.yml new file mode 100644 index 00000000000..a106501a16f --- /dev/null +++ b/changelogs/fragments/docker-default-ssl.yml @@ -0,0 +1,3 @@ +--- +bugfixes: +- fix default SSL version for docker modules https://github.com/ansible/ansible/issues/42897 diff --git a/lib/ansible/module_utils/docker_common.py b/lib/ansible/module_utils/docker_common.py index 0955e79748c..8cd691db713 100644 --- a/lib/ansible/module_utils/docker_common.py +++ b/lib/ansible/module_utils/docker_common.py @@ -80,7 +80,6 @@ DEFAULT_TLS = False DEFAULT_TLS_VERIFY = False DEFAULT_TLS_HOSTNAME = 'localhost' MIN_DOCKER_VERSION = "1.7.0" -DEFAULT_SSL_VERSION = "1.0" DEFAULT_TIMEOUT_SECONDS = 60 DOCKER_COMMON_ARGS = dict( @@ -91,7 +90,7 @@ DOCKER_COMMON_ARGS = dict( cacert_path=dict(type='str', aliases=['tls_ca_cert']), cert_path=dict(type='str', aliases=['tls_client_cert']), key_path=dict(type='str', aliases=['tls_client_key']), - ssl_version=dict(type='str', default=DEFAULT_SSL_VERSION), + ssl_version=dict(type='str'), tls=dict(type='bool', default=DEFAULT_TLS), tls_verify=dict(type='bool', default=DEFAULT_TLS_VERIFY), debug=dict(type='bool', default=False) diff --git a/lib/ansible/utils/module_docs_fragments/docker.py b/lib/ansible/utils/module_docs_fragments/docker.py index 6d3464059ab..5ddb13b94a7 100644 --- a/lib/ansible/utils/module_docs_fragments/docker.py +++ b/lib/ansible/utils/module_docs_fragments/docker.py @@ -61,8 +61,7 @@ options: - tls_client_key ssl_version: description: - - Provide a valid SSL version number. Default value determined by docker-py, currently 1.0. - default: "1.0" + - Provide a valid SSL version number. Default value determined by ssl.py module. tls: description: - Secure the connection to the API by using TLS without verifying the authenticity of the Docker host