openstack
/
puppet-neutron
Code Issues Proposed changes

dhcp-agent: Remove outdated default of resync_interval 

Default value of resync_interval in Neutron was changed from 30 to 5
a long ago[1]. This change removes the outdated default definition in
puppet-neutron so that the new default is effectively used.

[1] cc78724a1e92887883149f5e3aee827283636733

Closes-Bug: #1965940
Related-Bug: #1128180
Change-Id: I08558b10d6421779c4a2767703a0120afbfaa8e0
This commit is contained in:
Takashi Kajinami 2022-03-22 21:57:12 +09:00
parent 38a1941018
commit dda0f3be5f
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/agents/dhcp.pp
View File

@ -24,7 +24,8 @@
# [*resync_interval*]
# (optional) The DHCP agent will resync its state with Neutron to recover
# from any transient notification or rpc errors. The interval is number of
# seconds between attempts. Defaults to 30.
# seconds between attempts.
# Defaults to $::os_service_default.
#
# [*interface_driver*]
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
@ -128,7 +129,7 @@ class neutron::agents::dhcp (
$manage_service = true,
$debug = $::os_service_default,
$state_path = '/var/lib/neutron',
$resync_interval = 30,
$resync_interval = $::os_service_default,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$dhcp_driver = $::os_service_default,
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',

6
releasenotes/notes/fix-dhcp-agent-resync_interval-3b872e123552f58c.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Default value of ``neutron::agent::dhcp::resync_interval`` was changed
from ``30`` to ``$::os_service_default``, which results in the service
default value(``5``).

12
spec/classes/neutron_agents_dhcp_spec.rb
View File

@ -14,7 +14,6 @@ describe 'neutron::agents::dhcp' do
:package_ensure => 'present',
:enabled => true,
:state_path => '/var/lib/neutron',
:resync_interval => 30,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:enable_isolated_metadata => false,
@ -33,7 +32,7 @@ describe 'neutron::agents::dhcp' do
it 'configures dhcp_agent.ini' do
should contain_neutron_dhcp_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/state_path').with_value(p[:state_path]);
should contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value(p[:resync_interval]);
should contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/root_helper').with_value(p[:root_helper]);
@ -96,6 +95,15 @@ describe 'neutron::agents::dhcp' do
end
end
context 'when resync_interval is set' do
before :each do
params.merge!(:resync_interval => 5)
end
it 'should configure the resync_interval parameter' do
should contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value(params[:resync_interval]);
end
end
context 'when enabling isolated metadata only' do
before :each do
params.merge!(:enable_isolated_metadata => true, :enable_metadata_network => false)