From 63989a9ff10cf421e9f6c14d206c7c6b099485e3 Mon Sep 17 00:00:00 2001 From: Dawud Date: Thu, 13 Aug 2026 13:20:59 +0000 Subject: Revert^2 "Add HAProxy timeout variables for cloudkitty API" This reverts commit c62d5e509b74fd39b09c272fb731b73088c3a55b. Reason for revert: Fixing broken tests Change-Id: Iea1d9ad71c64642fadb7d02d50f9421cbe64acb7 Signed-off-by: Dawud (cherry picked from commit 1839ef9a957432b08c81756780e20d7374e5bb89) --- ansible/roles/cloudkitty/defaults/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'ansible') diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 0b74f8e27..8cfe7d3a4 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/ansible/roles/cloudkitty/defaults/main.yml @@ -16,9 +16,12 @@ cloudkitty_services: external: false port: "{{ cloudkitty_api_port }}" listen_port: "{{ cloudkitty_api_listen_port }}" + frontend_http_extra: + - "timeout client {{ haproxy_cloudkitty_api_client_timeout }}" backend_http_extra: - "option httpchk GET /healthcheck" - "http-check expect status 200" + - "timeout server {{ haproxy_cloudkitty_api_server_timeout }}" cloudkitty_api_external: enabled: "{{ enable_cloudkitty }}" mode: "http" @@ -26,9 +29,12 @@ cloudkitty_services: external_fqdn: "{{ cloudkitty_external_fqdn }}" port: "{{ cloudkitty_api_public_port }}" listen_port: "{{ cloudkitty_api_listen_port }}" + frontend_http_extra: + - "timeout client {{ haproxy_cloudkitty_api_client_timeout }}" backend_http_extra: - "option httpchk GET /healthcheck" - "http-check expect status 200" + - "timeout server {{ haproxy_cloudkitty_api_server_timeout }}" cloudkitty-processor: container_name: "cloudkitty_processor" group: "cloudkitty-processor" @@ -52,6 +58,12 @@ cloudkitty_database_name: "cloudkitty" cloudkitty_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}cloudkitty{% endif %}" cloudkitty_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}" +#################### +# HAProxy +#################### +haproxy_cloudkitty_api_client_timeout: "1m" +haproxy_cloudkitty_api_server_timeout: "1m" + #################### # Database sharding #################### -- cgit v1.2.3