openstack
/
charm-octavia
Code Issues Proposed changes

Add amphora connection timeouts options to charm 

This patch adds the possibility to configure the number of retries
and the timeout between those retries when connection to the
amphorae.

Closes-bug: #1988094
Change-Id: Idf25c327fe34f751f622a3a467a5ba8f73125681
(cherry picked from commit d1d369c703)
(cherry picked from commit f3617cafd8)
This commit is contained in:
Tiago Pasqualini 2022-08-29 18:29:39 -03:00 committed by Rodrigo Barbieri
parent e5815a5e94
commit af0e077bf0
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/config.yaml
View File

@ -198,3 +198,26 @@ options:
to expire before raising a Critical alert.
openstack-origin:
default: yoga
connection-max-retries:
default: 120
type: int
description: |
Retry threshold for connecting to amphorae. This is used when waiting
for a new amphora to become available as well as during a failover.
connection-retry-interval:
default: 5
type: int
description: |
Retry timeout between connection attempts in seconds. This is used
when waiting for a new amphora to become available as well as during a
failover.
active-connection-max-retries:
default: 15
type: int
description: |
Retry threshold for connecting to an active amphora.
active-connection-retry-interval:
default: 2
type: int
description: |
Retry timeout between connection attempts in seconds for active amphora.

5
src/templates/victoria/octavia.conf
View File

@ -100,6 +100,11 @@ server_ca = {{ options.issuing_cacert }}
# This certificate is used by the ``Octavia`` controller when it takes on the
# role as a "client" connecting to the ``Amphorae``.
client_cert = {{ options.controller_cert }}
connection_max_retries = {{ options.connection_max_retries }}
connection_retry_interval = {{ options.connection_retry_interval }}
active_connection_max_retries = {{ options.active_connection_max_retries }}
active_connection_retry_interval = {{ options.active_connection_retry_interval }}
{% include "parts/section-database" %}

4
src/templates/xena/octavia.conf
View File

@ -105,6 +105,10 @@ server_ca = {{ options.issuing_cacert }}
# This certificate is used by the ``Octavia`` controller when it takes on the
# role as a "client" connecting to the ``Amphorae``.
client_cert = {{ options.controller_cert }}
connection_max_retries = {{ options.connection_max_retries }}
connection_retry_interval = {{ options.connection_retry_interval }}
active_connection_max_retries = {{ options.active_connection_max_retries }}
active_connection_retry_interval = {{ options.active_connection_retry_interval }}
{% include "parts/section-database" %}