diff options
| author | Zuul <zuul@review.opendev.org> | 2026-04-01 11:31:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-04-01 11:31:00 +0000 |
| commit | 7e9c345613dade635fc31362325091f56801b2be (patch) | |
| tree | d5659cfe2b96f280b4b99e7079e7ff12db54a151 | |
| parent | 3609bf948134d41e05be92a758a752f2eb60696c (diff) | |
| parent | 7aab7e997e4e99e4d227a997ffc90d376bb49ab1 (diff) | |
| download | kolla-ansible-7e9c345613dade635fc31362325091f56801b2be.tar.gz kolla-ansible-7e9c345613dade635fc31362325091f56801b2be.zip | |
Merge "Add HAProxy timeout variables for cloudkitty API"
| -rw-r--r-- | ansible/roles/cloudkitty/defaults/main.yml | 12 | ||||
| -rw-r--r-- | releasenotes/notes/cloudkitty-haproxy-custom-timeouts-2f5c30619269d2f0.yaml | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index c5c093571..73ab090e8 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/ansible/roles/cloudkitty/defaults/main.yml @@ -16,8 +16,11 @@ 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" + - "timeout server {{ haproxy_cloudkitty_api_server_timeout }}" cloudkitty_api_external: enabled: "{{ enable_cloudkitty }}" mode: "http" @@ -25,8 +28,11 @@ 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" + - "timeout server {{ haproxy_cloudkitty_api_server_timeout }}" cloudkitty-processor: container_name: "cloudkitty_processor" group: "cloudkitty-processor" @@ -51,6 +57,12 @@ cloudkitty_database_user: "{% if use_preconfigured_databases | bool and use_comm cloudkitty_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}" #################### +# HAProxy +#################### +haproxy_cloudkitty_api_client_timeout: "{{ haproxy_client_timeout }}" +haproxy_cloudkitty_api_server_timeout: "{{ haproxy_server_timeout }}" + +#################### # Database sharding #################### cloudkitty_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ cloudkitty_database_shard_id }}{% else %}{{ database_user }}{% endif %}" diff --git a/releasenotes/notes/cloudkitty-haproxy-custom-timeouts-2f5c30619269d2f0.yaml b/releasenotes/notes/cloudkitty-haproxy-custom-timeouts-2f5c30619269d2f0.yaml new file mode 100644 index 000000000..4af231f9d --- /dev/null +++ b/releasenotes/notes/cloudkitty-haproxy-custom-timeouts-2f5c30619269d2f0.yaml @@ -0,0 +1,11 @@ +--- +features: + - | + CloudKitty v1 API does not support pagination, which may require increasing + timeouts for large requests. Adds two HAProxy timeout variables for the + CloudKitty API: ``haproxy_cloudkitty_api_client_timeout`` and + ``haproxy_cloudkitty_api_server_timeout``. These variables are used to + populate HAProxy's ``frontend_http_extra`` and ``backend_http_extra`` for + the ``cloudkitty_api`` and ``cloudkitty_api_external`` listeners. The + defaults are set to the values of ``haproxy_client_timeout`` and + ``haproxy_server_timeout``. |