Added support for Neutron loggings service plugin configuration
Depends-On: https://review.opendev.org/c/openstack/puppet-neutron/+/804220/ Related: rhbz#1990357 Change-Id: Ic045cdf0544fffeed51871d5b970fd29707fcd95
This commit is contained in:
parent
92f6208b67
commit
c9f0a5af01
@ -125,11 +125,29 @@ parameters:
|
|||||||
will be passed
|
will be passed
|
||||||
type: string
|
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:
|
conditions:
|
||||||
az_set:
|
az_set:
|
||||||
not: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
|
not: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
|
||||||
l3_agent_extensions_set:
|
l3_agent_extensions_set:
|
||||||
not: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
|
not: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
|
||||||
|
network_log_local_output_log_base_set:
|
||||||
|
not: {equals : [{get_param: NeutronL3AgentLoggingLocalOutputLogBase}, '']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
@ -209,6 +227,11 @@ outputs:
|
|||||||
- l3_agent_extensions_set
|
- l3_agent_extensions_set
|
||||||
- neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
|
- neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
|
||||||
- neutron::agents::l3::radvd_user: {get_param: NeutronL3AgentRadvdUser}
|
- 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:
|
service_config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, service_config_settings]
|
- get_attr: [NeutronBase, role_data, service_config_settings]
|
||||||
|
@ -141,6 +141,22 @@ parameters:
|
|||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
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:
|
conditions:
|
||||||
firewall_driver_set:
|
firewall_driver_set:
|
||||||
not: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
|
not: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
|
||||||
@ -148,6 +164,8 @@ conditions:
|
|||||||
not: {equals : [{get_param: NeutronEnableDVR}, '']}
|
not: {equals : [{get_param: NeutronEnableDVR}, '']}
|
||||||
ethertypes_set:
|
ethertypes_set:
|
||||||
not: {equals : [{get_param: NeutronPermittedEthertypes}, []]}
|
not: {equals : [{get_param: NeutronPermittedEthertypes}, []]}
|
||||||
|
network_log_local_output_log_base_set:
|
||||||
|
not: {equals : [{get_param: NeutronOVSAgentLoggingLocalOutputLogBase}, '']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
@ -234,6 +252,11 @@ outputs:
|
|||||||
if:
|
if:
|
||||||
- ethertypes_set
|
- ethertypes_set
|
||||||
- {get_param: NeutronPermittedEthertypes}
|
- {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:
|
service_config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
|
@ -92,6 +92,23 @@ parameters:
|
|||||||
'ovs-appctl -t ovs-vswitchd dpif/show-dp-features
|
'ovs-appctl -t ovs-vswitchd dpif/show-dp-features
|
||||||
br-int | grep "Check pkt length action"'.
|
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:
|
conditions:
|
||||||
neutron_dvr_set:
|
neutron_dvr_set:
|
||||||
not: {equals : [{get_param: NeutronEnableDVR}, '']}
|
not: {equals : [{get_param: NeutronEnableDVR}, '']}
|
||||||
@ -100,6 +117,8 @@ conditions:
|
|||||||
or:
|
or:
|
||||||
- {not: {equals: [{get_param: NeutronVhostuserSocketDir}, ""]}}
|
- {not: {equals: [{get_param: NeutronVhostuserSocketDir}, ""]}}
|
||||||
- {not: {equals: [{get_param: [RoleParameters, NeutronVhostuserSocketDir]}, ""]}}
|
- {not: {equals: [{get_param: [RoleParameters, NeutronVhostuserSocketDir]}, ""]}}
|
||||||
|
network_log_local_output_log_base_set:
|
||||||
|
not: {equals : [{get_param: NeutronOVNLoggingLocalOutputLogBase}, '']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
NeutronMl2Base:
|
NeutronMl2Base:
|
||||||
@ -148,6 +167,11 @@ outputs:
|
|||||||
- values: {get_param: RoleParameters}
|
- values: {get_param: RoleParameters}
|
||||||
- values:
|
- values:
|
||||||
NeutronVhostuserSocketDir: {get_param: NeutronVhostuserSocketDir}
|
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: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::plugins::ml2
|
include tripleo::profile::base::neutron::plugins::ml2
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
|
@ -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``.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user