commit f7cbb017aa7666432b9f5dfe0d906fad047bced9
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Apr 11 12:21:23 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Apr 11 12:21:23 2019 +0000
tree 492b4eab14ac8a1bc7e7c0b2f12470349dcd428c
parent d972f303ffd5888682bc5b947224624b0477e227
parent 030d06c0a126d4a2a2d1a5ac0ee36f46aabcf080

Merge "Reduce connection_max_retries" into release/2019.2.0

octavia/files/pike/octavia_manager.conf

diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index 03c57b3..a25f557 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 = 100
 
 # Retry timeout between connection attempts in seconds. (integer value)
 #connection_retry_interval = 5

octavia/files/queens/octavia_manager.conf

diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index 791e71b..4b1f484 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 = 1500
+connection_max_retries = 100
 
 # Retry timeout between connection attempts in seconds. (integer value)
 #connection_retry_interval = 5