openstack/puppet-neutron
Code Issues Proposed changes

taas: Remove vlan_range_start/end in agent side

Browse Source 
These were deprecated during the past cycle by [1] in favor of
the same parameters implemented for server side.

[1] 87862a8ad1

Change-Id: Ie3dee86a6ec97ec19991bb48a85827c24153507f
This commit is contained in:
Takashi Kajinami
2025-06-24 15:06:33 +09:00
parent 646c5d35c0
commit 536d1bfae4
3 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/agents/taas.pp
View File

@@ -23,37 +23,14 @@
# (optional) Seconds between periodic task runs.
# Defaults to $facts['os_service_default'].
#
# DEPRECATED PARAMETERS
#
# [*vlan_range_start*]
# (optional) Starting rantge of TAAS VLAN IDs.
# Defaults to $facts['os_service_default'].
#
# [*vlan_range_end*]
# (optional) End rantge of TAAS VLAN IDs.
# Defaults to $facts['os_service_default'].
#
class neutron::agents::taas (
$package_ensure = present,
$taas_agent_periodic_interval = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$vlan_range_start = undef,
$vlan_range_end = undef,
) {
include neutron::deps
include neutron::params
[
'vlan_range_start',
'vlan_range_end'
].each | $opt | {
if getvar($opt) {
warning("The ${opt} parameter has been deprecated and will be removed in a future release. \
Use the neutron::services::taas class parametes instead.")
}
}
# NOTE(tkajinam): taas provides not its own agent but l2 agent extension so
# configure these options in the core plugin file so that
# these options are loaded by l2 agents such as ovs-agent.
@@ -61,11 +38,6 @@ Use the neutron::services::taas class parametes instead.")
'DEFAULT/taas_agent_periodic_interval': value => $taas_agent_periodic_interval;
}
neutron_plugin_ml2 {
'taas/vlan_range_start': value => pick($vlan_range_start, $facts['os_service_default']);
'taas/vlan_range_end': value => pick($vlan_range_end, $facts['os_service_default']);
}
ensure_packages( 'neutron-taas', {
'ensure' => $package_ensure,
'name' => $::neutron::params::taas_package,

9
releasenotes/notes/remove-taas-agent-vlan-range-ead775345674ae97.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
upgrade:
- |
The following parameters of the ``neutron::agents::taas`` class have been
removed.
- ``vlan_range_start``
- ``vlan_range_end``

6
spec/classes/neutron_agents_taas_spec.rb
View File

@@ -15,8 +15,6 @@ describe 'neutron::agents::taas' do
it 'configures ml2_plugin.conf' do
should contain_neutron_plugin_ml2('DEFAULT/taas_agent_periodic_interval').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('taas/vlan_range_start').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('taas/vlan_range_end').with_value('<SERVICE DEFAULT>')
end
it 'installs neutron taas package' do
@@ -32,15 +30,11 @@ describe 'neutron::agents::taas' do
let :params do
{
:taas_agent_periodic_interval => 5,
:vlan_range_start => 1,
:vlan_range_end => 100,
}
end
it 'configures ml2_plugin.conf' do
should contain_neutron_plugin_ml2('DEFAULT/taas_agent_periodic_interval').with_value(5)
should contain_neutron_plugin_ml2('taas/vlan_range_start').with_value(1)
should contain_neutron_plugin_ml2('taas/vlan_range_end').with_value(100)
end
end
end