openstack/kolla-ansible
Code Issues Proposed changes

Merge "Set default timeout to 60 seconds for docker stop"

Browse Source
This commit is contained in:
Zuul 2019-08-27 12:42:43 +00:00 committed by Gerrit Code Review
commit e8f17f5b7a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/group_vars/all.yml
View File

@ -110,6 +110,9 @@ docker_restart_policy_retry: "10"
docker_configure_for_zun: "no" docker_configure_for_zun: "no"
docker_zun_options: -H fd:// -H tcp://{{ api_interface_address }}:2375 --cluster-store=etcd://{% for host in groups.get('etcd', []) %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ hostvars[host]['etcd_client_port'] }}{% if not loop.last %},{% endif %}{% endfor %} docker_zun_options: -H fd:// -H tcp://{{ api_interface_address }}:2375 --cluster-store=etcd://{% for host in groups.get('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 # Common options used throughout Docker
docker_common_options: docker_common_options:
auth_email: "{{ docker_registry_email }}" auth_email: "{{ docker_registry_email }}"
@ -120,6 +123,7 @@ docker_common_options:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
restart_policy: "{{ docker_restart_policy }}" restart_policy: "{{ docker_restart_policy }}"
restart_retries: "{{ docker_restart_policy_retry }}" restart_retries: "{{ docker_restart_policy_retry }}"
graceful_timeout: "{{ docker_graceful_timeout }}"
#################### ####################
# Dimensions options # Dimensions options

6
releasenotes/notes/docker-stop-timeout-c8089f6bf92d6c28.yaml Normal file
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.