Make connection_max_retries configurable
Change-Id: I856577580c2cd594b7bfef81170435e00d04b59c
Related-PROD: PROD-31782
diff --git a/metadata/service/manager/cluster.yml b/metadata/service/manager/cluster.yml
index cd0db05..4050391 100644
--- a/metadata/service/manager/cluster.yml
+++ b/metadata/service/manager/cluster.yml
@@ -8,6 +8,7 @@
octavia_loadbalancer_topology: 'SINGLE'
octavia_hm_bind_port: 5555
octavia_amphora_availability_zone: 'nova'
+ octavia_worker_connection_max_retries: 500
octavia:
manager:
enabled: true
@@ -49,6 +50,7 @@
client_cert_key: '/etc/octavia/certs/client.key'
client_cert_all: '/etc/octavia/certs/client_all.pem'
server_ca: '/etc/octavia/certs/ca_01.pem'
+ connection_max_retries: ${_param:octavia_worker_connection_max_retries}
health_manager:
bind_ip: ${_param:octavia_hm_bind_ip}
bind_port: ${_param:octavia_hm_bind_port}
diff --git a/metadata/service/manager/single.yml b/metadata/service/manager/single.yml
index 4bde8bb..e0a91fa 100644
--- a/metadata/service/manager/single.yml
+++ b/metadata/service/manager/single.yml
@@ -8,6 +8,7 @@
octavia_loadbalancer_topology: 'SINGLE'
octavia_hm_bind_port: 5555
octavia_amphora_availability_zone: 'nova'
+ octavia_worker_connection_max_retries: 500
octavia:
manager:
enabled: true
@@ -49,6 +50,7 @@
client_cert_key: '/etc/octavia/certs/client.key'
client_cert_all: '/etc/octavia/certs/client_all.pem'
server_ca: '/etc/octavia/certs/ca_01.pem'
+ connection_max_retries: ${_param:octavia_worker_connection_max_retries}
health_manager:
bind_ip: ${_param:octavia_hm_bind_ip}
bind_port: ${_param:octavia_hm_bind_port}
diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index 2c38f0e..c21e744 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -824,7 +824,7 @@
# Retry threshold for connecting to amphorae. (integer value)
#connection_max_retries = 300
-connection_max_retries = 1500
+connection_max_retries = {{ manager.haproxy_amphora.get('connection_max_retries', '500') }}
# Retry timeout between connection attempts in seconds. (integer value)
#connection_retry_interval = 5
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index 218127c..c236a7f 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -642,7 +642,7 @@
# Retry threshold for connecting to amphorae. (integer value)
#connection_max_retries = 300
-connection_max_retries = 100
+connection_max_retries = {{ manager.haproxy_amphora.get('connection_max_retries', '500') }}
# Retry timeout between connection attempts in seconds. (integer value)
#connection_retry_interval = 5
diff --git a/octavia/files/rocky/octavia_manager.conf b/octavia/files/rocky/octavia_manager.conf
index 65d871c..7336e8f 100644
--- a/octavia/files/rocky/octavia_manager.conf
+++ b/octavia/files/rocky/octavia_manager.conf
@@ -342,7 +342,7 @@
# Retry threshold for connecting to amphorae. (integer value)
#connection_max_retries = 300
-connection_max_retries = 100
+connection_max_retries = {{ manager.haproxy_amphora.get('connection_max_retries', '500') }}
# Retry timeout between connection attempts in seconds. (integer value)
#connection_retry_interval = 5