diff options
| author | Zuul <zuul@review.opendev.org> | 2026-04-02 12:38:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-04-02 12:38:31 +0000 |
| commit | ac1c40288cdb86ce2a5a8f974edd059551fd4bc1 (patch) | |
| tree | afb591adb08cd0f3b1ec9cd7f573367adbcbbec5 | |
| parent | 3255aa8c574f2fe679de07b1168f646a059a4d5b (diff) | |
| parent | c62d5e509b74fd39b09c272fb731b73088c3a55b (diff) | |
| download | kolla-ansible-ac1c40288cdb86ce2a5a8f974edd059551fd4bc1.tar.gz kolla-ansible-ac1c40288cdb86ce2a5a8f974edd059551fd4bc1.zip | |
Merge "Revert "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, 0 insertions, 23 deletions
diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 73ab090e8..c5c093571 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/ansible/roles/cloudkitty/defaults/main.yml @@ -16,11 +16,8 @@ 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" @@ -28,11 +25,8 @@ 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" @@ -57,12 +51,6 @@ 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 deleted file mode 100644 index 4af231f9d..000000000 --- a/releasenotes/notes/cloudkitty-haproxy-custom-timeouts-2f5c30619269d2f0.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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``. |