Fix ssl_version default value. (#42955)
* Fix ssl_version default value. * Add changelog
This commit is contained in:
parent
dba975470d
commit
5d23406926
3 changed files with 5 additions and 4 deletions
3
changelogs/fragments/docker-default-ssl.yml
Normal file
3
changelogs/fragments/docker-default-ssl.yml
Normal file
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
bugfixes:
|
||||
- fix default SSL version for docker modules https://github.com/ansible/ansible/issues/42897
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue