Merge "Added support for Neutron loggings service plugin configuration" into stable/victoria

deployment/neutron/neutron-l3-container-puppet.yaml

@@ -130,6 +130,22 @@ parameters:
       will be passed
     type: string
 
+  NeutronL3AgentLoggingRateLimit:
+    default: 100
+    description: |
+      Maximum number of packets logging per second
+    type: number
+  NeutronL3AgentLoggingBurstLimit:
+    default: 25
+    description: |
+      Maximum number of packets per rate_limit
+    type: number
+  NeutronL3AgentLoggingLocalOutputLogBase:
+    default: ''
+    description: |
+      Output logfile path on agent side, default syslog file
+    type: string
+
 conditions:
   keepalived_wrapper_enabled: {equals: [{get_param: NeutronEnableKeepalivedWrapper}, true]}
   haproxy_wrapper_enabled: {equals: [{get_param: NeutronEnableHaproxyDockerWrapper}, true]}
@@ -139,6 +155,8 @@ conditions:
   service_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
   az_unset: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
   l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
+  network_log_local_output_log_base_set:
+    not: {equals : [{get_param: NeutronL3AgentLoggingLocalOutputLogBase}, '']}
 
 resources:
 
@@ -222,6 +240,12 @@ outputs:
             - {}
             - neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
           - neutron::agents::l3::radvd_user: {get_param: NeutronL3AgentRadvdUser}
+          - neutron::agents::l3::network_log_rate_limit: {get_param: NeutronL3AgentLoggingRateLimit}
+          - neutron::agents::l3::network_log_burst_limit: {get_param: NeutronL3AgentLoggingBurstLimit}
+          - if:
+            - network_log_local_output_log_base_set
+            - neutron::agents::l3::network_log_local_output_log_base: {get_param: NeutronL3AgentLoggingLocalOutputLogBase}
+            - {}
       service_config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, service_config_settings]

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -144,11 +144,29 @@ parameters:
     type: boolean
     default: false
 
+  NeutronOVSAgentLoggingRateLimit:
+    default: 100
+    description: |
+      Maximum number of packets logging per second
+    type: number
+  NeutronOVSAgentLoggingBurstLimit:
+    default: 25
+    description: |
+      Maximum number of packets per rate_limit
+    type: number
+  NeutronOVSAgentLoggingLocalOutputLogBase:
+    default: ''
+    description: |
+      Output logfile path on agent side, default syslog file
+    type: string
+
 conditions:
   no_firewall_driver: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
   docker_puppet_mount_host: {equals: [{get_param: DockerPuppetMountHostPuppet}, true]}
   neutron_dvr_unset: {equals : [{get_param: NeutronEnableDVR}, '']}
   ethertypes_unset: {equals : [{get_param: NeutronPermittedEthertypes}, []]}
+  network_log_local_output_log_base_set:
+    not: {equals : [{get_param: NeutronOVSAgentLoggingLocalOutputLogBase}, '']}
 
 resources:
 
@@ -240,6 +258,12 @@ outputs:
             - ethertypes_unset
             - {}
             - neutron::agents::ml2::ovs::permitted_ethertypes: {get_param: NeutronPermittedEthertypes}
+          - neutron::agents::ml2::ovs::network_log_rate_limit: {get_param: NeutronOVSAgentLoggingRateLimit}
+          - neutron::agents::ml2::ovs::network_log_burst_limit: {get_param: NeutronOVSAgentLoggingBurstLimit}
+          - if:
+            - network_log_local_output_log_base_set
+            - neutron::agents::ml2::ovs::network_log_local_output_log_base: {get_param: NeutronOVSAgentLoggingLocalOutputLogBase}
+            - {}
 
       service_config_settings:
         map_merge:

deployment/neutron/neutron-plugin-ml2-ovn.yaml

@@ -117,6 +117,23 @@ parameters:
                  'ovs-appctl -t ovs-vswitchd dpif/show-dp-features
                  br-int | grep "Check pkt length action"'.
 
+  NeutronOVNLoggingRateLimit:
+    default: 100
+    description: |
+      Maximum number of packets logging per second
+    type: number
+  NeutronOVNLoggingBurstLimit:
+    default: 25
+    description: |
+      Maximum number of packets per rate_limit
+    type: number
+  NeutronOVNLoggingLocalOutputLogBase:
+    default: ''
+    description: |
+      Output logfile path on agent side, default syslog file
+    type: string
+
+
 conditions:
   neutron_dvr_unset: {equals : [{get_param: NeutronEnableDVR}, '']}
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@@ -124,6 +141,8 @@ conditions:
     or:
     - {not: {equals: [{get_param: NeutronVhostuserSocketDir}, ""]}}
     - {not: {equals: [{get_param: [RoleParameters, NeutronVhostuserSocketDir]}, ""]}}
+  network_log_local_output_log_base_set:
+    not: {equals : [{get_param: NeutronOVNLoggingLocalOutputLogBase}, '']}
 
 resources:
 
@@ -183,7 +202,12 @@ outputs:
                 - values:
                     NeutronVhostuserSocketDir: {get_param: NeutronVhostuserSocketDir}
               - {}
-
+          - neutron::agents::ml2::ovn::network_log_rate_limit: {get_param: NeutronOVNLoggingRateLimit}
+          - neutron::agents::ml2::ovn::network_log_burst_limit: {get_param: NeutronOVNLoggingBurstLimit}
+          - if:
+            - network_log_local_output_log_base_set
+            - neutron::agents::ml2::ovn::network_log_local_output_log_base: {get_param: NeutronOVNLoggingLocalOutputLogBase}
+            - {}
       step_config: |
         include tripleo::profile::base::neutron::plugins::ml2
       metadata_settings:

releasenotes/notes/neutron-logging-plugin-support-added-b2e1292d49e087c3.yaml

@@ -0,0 +1,12 @@
+---
+features:
+  - |
+    New config options for Neutron logging service plugin configuration were
+    added. There are options added for L3 Agent:
+    ``NeutronL3AgentLoggingRateLimit``, ``NeutronL3AgentLoggingBurstLimit``,
+    ``NeutronL3AgentLoggingLocalOutputLogBase``, for OVS agent:
+    ``NeutronOVSAgentLoggingRateLimit``, ``NeutronOVSAgentLoggingBurstLimit``,
+    ``NeutronOVSAgentLoggingLocalOutputLogBase`` and for ML2/OVN backend:
+    ``NeutronOVNLoggingRateLimit``, ``NeutronOVNLoggingBurstLimit``,
+    ``NeutronOVNLoggingLocalOutputLogBase``.
+