From 7d756756d65ff0d9fa5d8040c76cec65ae1c718f Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Fri, 20 Sep 2019 14:09:51 -0700
Subject: [PATCH] Add the Octavia log offload parameters

This patch add the following new parameters for Octavia:

1. OctaviaAdminLogTargets
2. OctaviaAdminLogFacility
3. OctaviaForwardAllLogs
4. OctaviaTenantLogTargets
5. OctaviaTenantLogFacility
6. OctaviaUserLogFormat
7. OctaviaDisableLocalLogStorage

The default values mirror the Octavia service default values.

Depends-On: https://review.opendev.org/#/c/683690
Change-Id: I46709b5e6cadab0137eafccb5896d5e55919f845
---
 deployment/octavia/octavia-base.yaml          | 48 +++++++++++++++++++
 ...g-offload-parameters-dc645daf909a85c2.yaml |  3 ++
 2 files changed, 51 insertions(+)
 create mode 100644 releasenotes/notes/add-octavia-log-offload-parameters-dc645daf909a85c2.yaml

diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml
index b93a776631..dbb769301b 100644
--- a/deployment/octavia/octavia-base.yaml
+++ b/deployment/octavia/octavia-base.yaml
@@ -143,6 +143,47 @@ parameters:
     default: 300
     description: Seconds to wait for a port to detach from an amphora.
     type: number
+  OctaviaAdminLogTargets:
+    default: []
+    description: List of syslog endpoints, host:port comma separated list,
+                 to receive administrative log messages.
+    type: comma_delimited_list
+  OctaviaAdminLogFacility:
+    default: 1
+    description: The syslog "LOG_LOCAL" facility to use for the administrative
+                 log messages.
+    type: number
+    constraints:
+      - range: { min: 0, max: 7 }
+        description: Facility must be between 0 and 7.
+  OctaviaForwardAllLogs:
+    default: false
+    description: When true, all log messages from the amphora will be forwarded
+                 to the administrative log endponts, including non-load
+                 balancing related logs.
+    type: boolean
+  OctaviaTenantLogTargets:
+    default: []
+    description: List of syslog endpoints, host:port comma separated list,
+                 to receive tenant traffic flow log messages.
+    type: comma_delimited_list
+  OctaviaTenantLogFacility:
+    default: 1
+    description: The syslog "LOG_LOCAL" facility to use for the tenant
+                 traffic flow log messages.
+    type: number
+    constraints:
+      - range: { min: 0, max: 7 }
+        description: Facility must be between 0 and 7.
+  OctaviaUserLogFormat:
+    default: "{{ '{{' }} project_id {{ '}}' }} {{ '{{' }} lb_id {{ '}}' }} %f %ci %cp %t %{+Q}r %ST %B %U %[ssl_c_verify] %{+Q}[ssl_c_s_dn] %b %s %Tt %tsc"
+    description: The tenant traffic flow log format string.
+    type: string
+  OctaviaDisableLocalLogStorage:
+    default: false
+    description: When true, logs will not be stored on the amphora filesystem.
+                 This includes all kernel, system, and security logs.
+    type: boolean
 
 conditions:
   service_debug_unset: {equals : [{get_param: OctaviaDebug}, '']}
@@ -198,6 +239,13 @@ outputs:
             octavia::controller::connection_max_retries: {get_param: OctaviaConnectionMaxRetries}
             octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
             octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
+            octavia::controller::admin_log_targets: {get_param: OctaviaAdminLogTargets}
+            octavia::controller::administrative_log_facility: {get_param: OctaviaAdminLogFacility}
+            octavia::controller::forward_all_logs: {get_param: OctaviaForwardAllLogs}
+            octavia::controller::tenant_log_targets: {get_param: OctaviaTenantLogTargets}
+            octavia::controller::user_log_facility: {get_param: OctaviaTenantLogFacility}
+            octavia::controller::user_log_format: {get_param: OctaviaUserLogFormat}
+            octavia::controller::disable_local_log_storage: {get_param: OctaviaDisableLocalLogStorage}
           -
             if:
             - octavia_topology_unset
diff --git a/releasenotes/notes/add-octavia-log-offload-parameters-dc645daf909a85c2.yaml b/releasenotes/notes/add-octavia-log-offload-parameters-dc645daf909a85c2.yaml
new file mode 100644
index 0000000000..a7ff03c0fb
--- /dev/null
+++ b/releasenotes/notes/add-octavia-log-offload-parameters-dc645daf909a85c2.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Added the Octavia log offload parameters.