Merge "Support configuration of Docker client timeout"

ansible/group_vars/all.yml

@@ -96,6 +96,8 @@ docker_namespace: "kolla"
 docker_registry_username:
 docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}"
 docker_runtime_directory: ""
+# Docker client timeout in seconds.
+docker_client_timeout: 120
 
 # Retention settings for Docker logs
 docker_log_max_file: "5"
@@ -127,6 +129,7 @@ docker_common_options:
   restart_policy: "{{ docker_restart_policy }}"
   restart_retries: "{{ docker_restart_policy_retry }}"
   graceful_timeout: "{{ docker_graceful_timeout }}"
+  client_timeout: "{{ docker_client_timeout }}"
 
 ####################
 # Dimensions options

ansible/library/kolla_docker.py

@@ -201,6 +201,12 @@ options:
     required: False
     default: False
     type: bool
+  client_timeout:
+    description:
+      - Docker client timeout in seconds
+    required: False
+    default: 120
+    type: int
 author: Sam Yaple
 '''
 
@@ -252,7 +258,8 @@ class DockerWorker(object):
         # tls_config = self.generate_tls()
 
         options = {
-            'version': self.params.get('api_version')
+            'version': self.params.get('api_version'),
+            'timeout': self.params.get('client_timeout'),
         }
 
         self.dc = get_docker_client()(**options)
@@ -957,6 +964,7 @@ def generate_module():
         volumes_from=dict(required=False, type='list'),
         dimensions=dict(required=False, type='dict', default=dict()),
         tty=dict(required=False, type='bool', default=False),
+        client_timeout=dict(required=False, type='int', default=120),
     )
     required_if = [
         ['action', 'pull_image', ['image']],

etc/kolla/globals.yml

@@ -57,6 +57,8 @@
 #docker_registry_insecure: "yes"
 #docker_registry_username: "sam"
 #docker_registry_password: "correcthorsebatterystaple"
+# Docker client timeout in seconds.
+#docker_client_timeout: 120
 
 #docker_configure_for_zun: "no"
 

releasenotes/notes/docker-client-timeout-dc221b2d350efad8.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Fixes an issue with Docker client timeouts where Docker reports 'Read
+    timed out'. The client timeout may be configured via
+    ``docker_client_timeout``. The default timeout has been increased to 120
+    seconds. See `bug
+    <https://bugs.launchpad.net/kolla-ansible/+bug/1809844>`__ for details.

tests/test_kolla_docker.py

@@ -98,6 +98,7 @@ class ModuleArgsTest(base.BaseTestCase):
             volumes_from=dict(required=False, type='list'),
             dimensions=dict(required=False, type='dict', default=dict()),
             tty=dict(required=False, type='bool', default=False),
+            client_timeout=dict(required=False, type='int', default=120),
             )
         required_if = [
             ['action', 'pull_image', ['image']],