From e90b0d898e72c60f34755f212a2cf669d82f26ae Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Tue, 17 Sep 2019 15:10:47 +0200
Subject: [PATCH] Add new parameter options to Octavia service

This patch adds three new parameters:

1. OctaviaConnectionMaxRetries
2. OctaviaBuildActiveRetries
3. OctaviaPortDetachTimeout

The default values are same as in octavia and puppet-octavia master
branches as of now.

Depends-On: https://review.opendev.org/#/c/682636/
Change-Id: Id5f7bb2160215170561f39015ddfdb93cba904b5
(cherry picked from commit f924a35d70270a96104a7381a32a6982d3678903)
---
 deployment/octavia/octavia-base.yaml              | 15 +++++++++++++++
 ...hree-more-octavia-params-1e4a32f910e5f1fc.yaml |  6 ++++++
 2 files changed, 21 insertions(+)
 create mode 100644 releasenotes/notes/add-three-more-octavia-params-1e4a32f910e5f1fc.yaml

diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml
index b90d91bd90..6ef467bbf3 100644
--- a/deployment/octavia/octavia-base.yaml
+++ b/deployment/octavia/octavia-base.yaml
@@ -149,6 +149,18 @@ parameters:
     default: 0
     description: Time to wait for TCP packets for content inspection.
     type: number
+  OctaviaConnectionMaxRetries:
+    default: 120
+    description: Retry threshold for connecting to amphorae.
+    type: number
+  OctaviaBuildActiveRetries:
+    default: 120
+    description: Retry threshold for waiting for a build slot for an amphorae.
+    type: number
+  OctaviaPortDetachTimeout:
+    default: 300
+    description: Seconds to wait for a port to detach from an amphora.
+    type: number
 
 parameter_groups:
 - label: deprecated
@@ -214,6 +226,9 @@ outputs:
             octavia::controller::timeout_member_connect: {get_param: OctaviaTimeoutMemberConnect}
             octavia::controller::timeout_member_data: {get_param: OctaviaTimeoutMemberData}
             octavia::controller::timeout_tcp_inspect: {get_param: OctaviaTimeoutTcpInspect}
+            octavia::controller::connection_max_retries: {get_param: OctaviaConnectionMaxRetries}
+            octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
+            octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
           -
             if:
             - octavia_topology_unset
diff --git a/releasenotes/notes/add-three-more-octavia-params-1e4a32f910e5f1fc.yaml b/releasenotes/notes/add-three-more-octavia-params-1e4a32f910e5f1fc.yaml
new file mode 100644
index 0000000000..f4e0d5f689
--- /dev/null
+++ b/releasenotes/notes/add-three-more-octavia-params-1e4a32f910e5f1fc.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Three new parameter options are now added to Octavia service
+    (OctaviaConnectionMaxRetries, OctaviaBuildActiveRetries,
+    OctaviaPortDetachTimeout)