openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix glance Upload large image haproxy timeout"

Browse Source
This commit is contained in:
Jenkins 2017-05-07 02:02:14 +00:00 committed by Gerrit Code Review
commit 3ba11be4a3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,3 +38,6 @@ haproxy_image_full: "{{ haproxy_image }}:{{ haproxy_tag }}"
haproxy_client_timeout: "1m"
haproxy_server_timeout: "1m"
haproxy_glance_api_client_timeout: "6h"
haproxy_glance_api_server_timeout: "6h"

2
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -92,6 +92,8 @@ listen glance_registry
listen glance_api
bind {{ kolla_internal_vip_address }}:{{ glance_api_port }}
timeout client {{ haproxy_glance_api_client_timeout }}
timeout server {{ haproxy_glance_api_server_timeout }}
{% for host in groups['glance-api'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_api_port }} check inter 2000 rise 2 fall 5
{% endfor %}