openstack/puppet-neutron
Code Issues Proposed changes

mlnx: Remove deprecated duplicate parameters

Browse Source 
This change removes the two parameters of networking-mlnx-agent, which
were deprecated by [1] during the Zed cycle, in favor of the duplicate
parameters in the different common classes.

[1] f7b4c844bc

Change-Id: I00cedb7a4a41333a6793d2358e64aa1ac4797fa8
This commit is contained in:
Takashi Kajinami 2022-11-15 10:55:13 +09:00
parent 3206f2f9c2
commit 2dd6369f93
3 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/agents/ml2/mlnx.pp
View File

@ -52,16 +52,6 @@
# be active for an extended amount of time.
# Defaults to false
#
# DEPRECATED PARAMETERS
#
# [*dhcp_broadcast_reply*]
# (optional) Use broadcast in DHCP replies
# Defaults to undef
#
# [*interface_driver*]
# (optional) The driver used to manage the virtual interface.
# Defaults to undef
#
class neutron::agents::ml2::mlnx (
$package_ensure = 'present',
$enabled = true,
@ -72,9 +62,6 @@ class neutron::agents::ml2::mlnx (
$multi_interface_driver_mappings = $::os_service_default,
$ipoib_physical_interface = $::os_service_default,
$enable_multi_interface_driver_cache_maintenance = false,
# DEPRECATED PARAMETERS
$dhcp_broadcast_reply = undef,
$interface_driver = undef,
) {
include neutron::deps
@ -109,29 +96,6 @@ class neutron::agents::ml2::mlnx (
'DEFAULT/enable_multi_interface_driver_cache_maintenance' : value => $enable_multi_interface_driver_cache_maintenance;
}
if $interface_driver {
warning("The interface_driver parameter is deprecated. Use the same parameter of \
neutron::agents::dhcp and neutron::agents::l3.")
# NOTE(tkajinam): ensure_resource is required to allow workaround for
# bug 1987460
ensure_resource('neutron_dhcp_agent_config', 'DEFAULT/interface_driver', {
'value' => $interface_driver
})
ensure_resource('neutron_l3_agent_config', 'DEFAULT/interface_driver', {
'value' => $interface_driver
})
}
if $dhcp_broadcast_reply {
warning("The dhcp_broadcast_reply parameter is deprecated. \
Use the neutron::agents::dhcp::dhcp_broadcast_reply parameter instead.")
# NOTE(tkajinam): ensure_resource is required to allow workaround for
# bug 1987460
ensure_resource('neutron_dhcp_agent_config', 'DEFAULT/dhcp_broadcast_reply', {
'value' => $dhcp_broadcast_reply
})
}
if $manage_package {
if $mlnx_agent_package != $mlnx_plugin_package {
$mlnx_agent_package_tag = ['openstack', 'neutron-package']

8
releasenotes/notes/cleanup-params-mlnx-antelope-9e4b06d28aed8ccf.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The following parameters of the ``neutron::agents::ml2::mlnx`` class have
been removed.
- ``dhcp_broadcast_reply``
- ``interface_driver``

21
spec/classes/neutron_agents_ml2_mlnx_spec.rb
View File

@ -92,27 +92,6 @@ describe 'neutron::agents::ml2::mlnx' do
should contain_neutron_l3_agent_config('DEFAULT/ipoib_physical_interface').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/enable_multi_interface_driver_cache_maintenance').with_value(false)
end
context 'with interface_driver' do
before :each do
params.merge!(:interface_driver => 'multi')
end
it 'configures neutron dhcp agent' do
should contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value('multi')
end
it 'configures neutron l3 agent' do
should contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value('multi')
end
end
context 'with dhcp_broadcast_reply' do
before :each do
params.merge!(:dhcp_broadcast_reply => true)
end
it 'configures neutron dhcp agent' do
should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value(true)
end
end
end
on_supported_os({