openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow configuration of HAProxy default timeouts"

Browse Source
This commit is contained in:
Jenkins 2017-02-07 17:31:32 +00:00 committed by Gerrit Code Review
commit 091b17a356
2 changed files with 5 additions and 2 deletions
ansible/roles/haproxy
defaults
main.yml
templates
haproxy.cfg.j2

3
ansible/roles/haproxy/defaults/main.yml

@ -12,3 +12,6 @@ keepalived_image_full: "{{ keepalived_image }}:{{ keepalived_tag }}"
haproxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-haproxy"
haproxy_tag: "{{ openstack_release }}"
haproxy_image_full: "{{ haproxy_image }}:{{ haproxy_tag }}"
haproxy_client_timeout: "1m"
haproxy_server_timeout: "1m"

4
ansible/roles/haproxy/templates/haproxy.cfg.j2

@ -25,8 +25,8 @@ defaults
timeout http-request 10s
timeout queue 1m
timeout connect 10s
timeout client 1m
timeout server 1m
timeout client {{ haproxy_client_timeout }}
timeout server {{ haproxy_server_timeout }}
timeout check 10s
listen stats