ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-09-09 22:51:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ssl_version default value. (#42955)

Browse source 
* Fix ssl_version default value.

* Add changelog
This commit is contained in:
Thierry Bouvet 2018-07-20 17:32:04 +02:00 • committed by Sam Doran
commit 5d23406926
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/docker-default-ssl.yml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- fix default SSL version for docker modules https://github.com/ansible/ansible/issues/42897

3
lib/ansible/module_utils/docker_common.py
View file

@ -80,7 +80,6 @@ DEFAULT_TLS = False
DEFAULT_TLS_VERIFY = False DEFAULT_TLS_VERIFY = False
DEFAULT_TLS_HOSTNAME = 'localhost' DEFAULT_TLS_HOSTNAME = 'localhost'
MIN_DOCKER_VERSION = "1.7.0" MIN_DOCKER_VERSION = "1.7.0"
DEFAULT_SSL_VERSION = "1.0"
DEFAULT_TIMEOUT_SECONDS = 60 DEFAULT_TIMEOUT_SECONDS = 60
DOCKER_COMMON_ARGS = dict( DOCKER_COMMON_ARGS = dict(
@ -91,7 +90,7 @@ DOCKER_COMMON_ARGS = dict(
cacert_path=dict(type='str', aliases=['tls_ca_cert']), cacert_path=dict(type='str', aliases=['tls_ca_cert']),
cert_path=dict(type='str', aliases=['tls_client_cert']), cert_path=dict(type='str', aliases=['tls_client_cert']),
key_path=dict(type='str', aliases=['tls_client_key']), 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=dict(type='bool', default=DEFAULT_TLS),
tls_verify=dict(type='bool', default=DEFAULT_TLS_VERIFY), tls_verify=dict(type='bool', default=DEFAULT_TLS_VERIFY),
debug=dict(type='bool', default=False) debug=dict(type='bool', default=False)

3
lib/ansible/utils/module_docs_fragments/docker.py
View file

@ -61,8 +61,7 @@ options:
- tls_client_key - tls_client_key
ssl_version: ssl_version:
description: description:
- Provide a valid SSL version number. Default value determined by docker-py, currently 1.0. - Provide a valid SSL version number. Default value determined by ssl.py module.
default: "1.0"
tls: tls:
description: description:
- Secure the connection to the API by using TLS without verifying the authenticity of the Docker host - Secure the connection to the API by using TLS without verifying the authenticity of the Docker host