openstack/puppet-neutron
Code Issues Proposed changes

l3: Support conntrackd options

Browse Source 
Add support for configuring options to use conntrackd for l3 agent,
to keep the connection tracking state during fail over.

Depends-on: https://review.opendev.org/917430
Change-Id: Idb5056183202344ecd10c72e42d75124fed9188c
This commit is contained in:
Takashi Kajinami
2025-02-13 16:15:41 +09:00
parent 14b6e61979
commit d7cd864b0b
3 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
manifests/agents/l3.pp
View File

@@ -65,6 +65,50 @@
# requests.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_enabled*]
# (optional) Enable conntrackd to syncrhonize connection tracking states
# between HA routers.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_hashsize*]
# (optional) Number of buckets in the cache hashtable.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_hashlimit*]
# (optional) Maximum number of conntracks.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_unix_backlog*]
# (optional) Unix socket backlog.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_socketbuffersize*]
# (optional) Socket buffer size for events.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_socketbuffersize_max_grown*]
# (optional) Maximum size of socket buffer.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_ipv4_mcast_addr*]
# (optional) Multicast address: The address that you use as destination in
# the syncrhonization messages.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_group*]
# (optional) The multicast base port number.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_sndsocketbuffer*]
# (optional) Buffer used to enqueue the packets that are going to be
# transmitted.
# Defaults to $facts['os_service_default']
#
# [*ha_conntrackd_rcvsocketbuffer*]
# (optional) Buffer used to enqueue the packages that the socket is pending
# to handle.
# Defaults to $facts['os_service_default']
#
# [*agent_mode*]
# (optional) The working mode for the agent.
# 'legacy': default behavior (without DVR)
@@ -155,6 +199,16 @@ class neutron::agents::l3 (
$ha_vrrp_advert_int = $facts['os_service_default'],
$ha_keepalived_state_change_server_threads = $facts['os_service_default'],
$ha_vrrp_health_check_interval = $facts['os_service_default'],
$ha_conntrackd_enabled = $facts['os_service_default'],
$ha_conntrackd_hashsize = $facts['os_service_default'],
$ha_conntrackd_hashlimit = $facts['os_service_default'],
$ha_conntrackd_unix_backlog = $facts['os_service_default'],
$ha_conntrackd_socketbuffersize = $facts['os_service_default'],
$ha_conntrackd_socketbuffersize_max_grown = $facts['os_service_default'],
$ha_conntrackd_ipv4_mcast_addr = $facts['os_service_default'],
$ha_conntrackd_group = $facts['os_service_default'],
$ha_conntrackd_sndsocketbuffer = $facts['os_service_default'],
$ha_conntrackd_rcvsocketbuffer = $facts['os_service_default'],
$agent_mode = $facts['os_service_default'],
$availability_zone = $facts['os_service_default'],
$extensions = $facts['os_service_default'],
@@ -196,6 +250,16 @@ class neutron::agents::l3 (
'DEFAULT/ha_vrrp_advert_int': value => $ha_vrrp_advert_int;
'DEFAULT/ha_keepalived_state_change_server_threads': value => $ha_keepalived_state_change_server_threads;
'DEFAULT/ha_vrrp_health_check_interval': value => $ha_vrrp_health_check_interval;
'DEFAULT/ha_conntrackd_enabled': value => $ha_conntrackd_enabled;
'DEFAULT/ha_conntrackd_hashsize': value => $ha_conntrackd_hashsize;
'DEFAULT/ha_conntrackd_hashlimit': value => $ha_conntrackd_hashlimit;
'DEFAULT/ha_conntrackd_unix_backlog': value => $ha_conntrackd_unix_backlog;
'DEFAULT/ha_conntrackd_socketbuffersize': value => $ha_conntrackd_socketbuffersize;
'DEFAULT/ha_conntrackd_socketbuffersize_max_grown': value => $ha_conntrackd_socketbuffersize_max_grown;
'DEFAULT/ha_conntrackd_ipv4_mcast_addr': value => $ha_conntrackd_ipv4_mcast_addr;
'DEFAULT/ha_conntrackd_group': value => $ha_conntrackd_group;
'DEFAULT/ha_conntrackd_sndsocketbuffer': value => $ha_conntrackd_sndsocketbuffer;
'DEFAULT/ha_conntrackd_rcvsocketbuffer': value => $ha_conntrackd_rcvsocketbuffer;
'DEFAULT/agent_mode': value => $agent_mode;
'DEFAULT/radvd_user': value => $radvd_user;
'ovs/integration_bridge': value => $ovs_integration_bridge;

5
releasenotes/notes/l3-agent-conntrackd-options-cfe8022f99833937.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
features:
- |
The ``neutron::agents::l3`` class now supports configuring conntrackd
options.

39
spec/classes/neutron_agents_l3_spec.rb
View File

@@ -36,6 +36,16 @@ describe 'neutron::agents::l3' do
should contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_advert_int').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_keepalived_state_change_server_threads').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_health_check_interval').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_enabled').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_hashsize').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_hashlimit').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_unix_backlog').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_socketbuffersize').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_socketbuffersize_max_grown').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_ipv4_mcast_addr').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_group').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_sndsocketbuffer').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_rcvsocketbuffer').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/agent_mode').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/radvd_user').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('ovs/integration_bridge').with_value('<SERVICE DEFAULT>')
@@ -133,6 +143,35 @@ describe 'neutron::agents::l3' do
end
end
context 'with conntrackd options' do
before :each do
params.merge!({
:ha_conntrackd_enabled => false,
:ha_conntrackd_hashsize => 32768,
:ha_conntrackd_hashlimit => 131072,
:ha_conntrackd_unix_backlog => 20,
:ha_conntrackd_socketbuffersize => 262142,
:ha_conntrackd_socketbuffersize_max_grown => 655355,
:ha_conntrackd_ipv4_mcast_addr => '225.0.0.50',
:ha_conntrackd_group => 3780,
:ha_conntrackd_sndsocketbuffer => 24985600,
:ha_conntrackd_rcvsocketbuffer => 24985601,
})
end
it 'should configure conntrackd' do
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_enabled').with_value(false)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_hashsize').with_value(32768)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_hashlimit').with_value(131072)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_unix_backlog').with_value(20)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_socketbuffersize').with_value(262142)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_socketbuffersize_max_grown').with_value(655355)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_ipv4_mcast_addr').with_value('225.0.0.50')
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_group').with_value(3780)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_sndsocketbuffer').with_value(24985600)
should contain_neutron_l3_agent_config('DEFAULT/ha_conntrackd_rcvsocketbuffer').with_value(24985601)
end
end
context 'with ovs_integration_bridge' do
before :each do
params.merge!(:ovs_integration_bridge => 'br-int')