From e765aa06fb8a3f3c55d8f5f8d755bd6fd6abd327 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Fri, 20 Sep 2019 13:30:35 -0700
Subject: [PATCH] Added the connection_logging parameter for Octavia

This patch adds the "connection_logging" configuration parameter
for the Octavia service. It defaults to true as it does in the
octavia service configuration defaults.

Depends-On: https://review.opendev.org/#/c/683713/
Change-Id: I72981f276064c1edbc2228f51a1ddeec2e3afce5
(cherry picked from commit b89454af62faf39cd662c8b7fabc524093b16935)
(cherry picked from commit 4d32c22fe71425deda9b0202d149f97335adbc11)
(cherry picked from commit db81ab9c9568390c905fbc395e1ae4dda1b6a25a)
---
 puppet/services/octavia-controller.yaml                      | 5 +++++
 .../add-connection-logging-parameter-e51f59175c8da204.yaml   | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/add-connection-logging-parameter-e51f59175c8da204.yaml

diff --git a/puppet/services/octavia-controller.yaml b/puppet/services/octavia-controller.yaml
index 3ebfbc2150..8dd3b337ed 100644
--- a/puppet/services/octavia-controller.yaml
+++ b/puppet/services/octavia-controller.yaml
@@ -56,6 +56,10 @@ parameters:
     default: 120
     description: Retry threshold for connecting to amphorae.
     type: number
+  OctaviaConnectionLogging:
+    default: true
+    description: When false, tenant connection flows will not be logged.
+    type: boolean
   OctaviaBuildActiveRetries:
     default: 120
     description: Retry threshold for waiting for a build slot for an amphorae.
@@ -94,6 +98,7 @@ outputs:
             octavia::controller::amp_ssh_key_name: {get_param: OctaviaAmphoraSshKeyName}
             octavia::controller::enable_ssh_access: true
             octavia::controller::connection_max_retries: {get_param: OctaviaConnectionMaxRetries}
+            octavia::controller::connection_logging: {get_param: OctaviaConnectionLogging}
             octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
             octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
           -
diff --git a/releasenotes/notes/add-connection-logging-parameter-e51f59175c8da204.yaml b/releasenotes/notes/add-connection-logging-parameter-e51f59175c8da204.yaml
new file mode 100644
index 0000000000..5e2052c3c2
--- /dev/null
+++ b/releasenotes/notes/add-connection-logging-parameter-e51f59175c8da204.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Added the "connection_logging" parameter for the Octavia service.