From 2caa77c03258bdc77000c07fc169cbdc2092524b Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 2 Jan 2024 14:05:27 +0100 Subject: [PATCH] Remove superfluous timeout argument. (#737) --- plugins/doc_fragments/docker.py | 7 ------- plugins/module_utils/common_cli.py | 2 -- 2 files changed, 9 deletions(-) diff --git a/plugins/doc_fragments/docker.py b/plugins/doc_fragments/docker.py index 1b9e67de..3973c062 100644 --- a/plugins/doc_fragments/docker.py +++ b/plugins/doc_fragments/docker.py @@ -331,13 +331,6 @@ options: type: str default: auto aliases: [ docker_api_version ] - timeout: - description: - - The maximum amount of time in seconds to wait on a response from the API. - - If the value is not specified in the task, the value of environment variable E(DOCKER_TIMEOUT) will be used - instead. If the environment variable is not set, the default value will be used. - type: int - default: 60 ca_cert: description: - Use a CA certificate when performing server verification by providing the path to a CA certificate file. diff --git a/plugins/module_utils/common_cli.py b/plugins/module_utils/common_cli.py index 75cef886..877fcbb8 100644 --- a/plugins/module_utils/common_cli.py +++ b/plugins/module_utils/common_cli.py @@ -22,7 +22,6 @@ from ansible_collections.community.docker.plugins.module_utils.util import ( # DEFAULT_DOCKER_HOST, DEFAULT_TLS, DEFAULT_TLS_VERIFY, - DEFAULT_TIMEOUT_SECONDS, DOCKER_MUTUALLY_EXCLUSIVE, DOCKER_REQUIRED_TOGETHER, sanitize_result, @@ -34,7 +33,6 @@ DOCKER_COMMON_ARGS = dict( docker_host=dict(type='str', default=DEFAULT_DOCKER_HOST, fallback=(env_fallback, ['DOCKER_HOST']), aliases=['docker_url']), tls_hostname=dict(type='str', fallback=(env_fallback, ['DOCKER_TLS_HOSTNAME'])), api_version=dict(type='str', default='auto', fallback=(env_fallback, ['DOCKER_API_VERSION']), aliases=['docker_api_version']), - timeout=dict(type='int', default=DEFAULT_TIMEOUT_SECONDS, fallback=(env_fallback, ['DOCKER_TIMEOUT'])), ca_cert=dict(type='path', aliases=['tls_ca_cert', 'cacert_path']), client_cert=dict(type='path', aliases=['tls_client_cert', 'cert_path']), client_key=dict(type='path', aliases=['tls_client_key', 'key_path']),