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 commitd1d369c703
) (cherry picked from commitf3617cafd8
)
This commit is contained in:
parent
e5815a5e94
commit
af0e077bf0
@ -198,3 +198,26 @@ options:
|
|||||||
to expire before raising a Critical alert.
|
to expire before raising a Critical alert.
|
||||||
openstack-origin:
|
openstack-origin:
|
||||||
default: yoga
|
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.
|
||||||
|
@ -100,6 +100,11 @@ server_ca = {{ options.issuing_cacert }}
|
|||||||
# This certificate is used by the ``Octavia`` controller when it takes on the
|
# This certificate is used by the ``Octavia`` controller when it takes on the
|
||||||
# role as a "client" connecting to the ``Amphorae``.
|
# role as a "client" connecting to the ``Amphorae``.
|
||||||
client_cert = {{ options.controller_cert }}
|
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" %}
|
{% include "parts/section-database" %}
|
||||||
|
|
||||||
|
@ -105,6 +105,10 @@ server_ca = {{ options.issuing_cacert }}
|
|||||||
# This certificate is used by the ``Octavia`` controller when it takes on the
|
# This certificate is used by the ``Octavia`` controller when it takes on the
|
||||||
# role as a "client" connecting to the ``Amphorae``.
|
# role as a "client" connecting to the ``Amphorae``.
|
||||||
client_cert = {{ options.controller_cert }}
|
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" %}
|
{% include "parts/section-database" %}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user