Set default timeout to 60 seconds for docker stop

The previous default timeout was 10 seconds, which does not always
allow services enough time to shut down safely.

Change-Id: I54eff91567108a7e5d99f067829ae4a6900cd859
This commit is contained in:
Mark Goddard 2019-07-09 16:49:59 +01:00
parent 249cb4be45
commit 33efcb814c
2 changed files with 10 additions and 0 deletions

View File

@ -110,6 +110,9 @@ docker_restart_policy_retry: "10"
docker_configure_for_zun: "no"
docker_zun_options: -H fd:// -H tcp://{{ api_interface_address }}:2375 --cluster-store=etcd://{% for host in groups['etcd'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ hostvars[host]['etcd_client_port'] }}{% if not loop.last %},{% endif %}{% endfor %}
# Timeout after Docker sends SIGTERM before sending SIGKILL.
docker_graceful_timeout: 60
# Common options used throughout Docker
docker_common_options:
auth_email: "{{ docker_registry_email }}"
@ -120,6 +123,7 @@ docker_common_options:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
restart_policy: "{{ docker_restart_policy }}"
restart_retries: "{{ docker_restart_policy_retry }}"
graceful_timeout: "{{ docker_graceful_timeout }}"
####################
# Dimensions options

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Increases the default value of ``docker_graceful_timeout`` from 10 to 60.
This sets the time that docker will wait for a container to gracefully stop
before issuing a KILL signal.