diff --git a/manifests/agents/taas.pp b/manifests/agents/taas.pp index bbb8b0b48..5c2563d1e 100644 --- a/manifests/agents/taas.pp +++ b/manifests/agents/taas.pp @@ -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, diff --git a/releasenotes/notes/remove-taas-agent-vlan-range-ead775345674ae97.yaml b/releasenotes/notes/remove-taas-agent-vlan-range-ead775345674ae97.yaml new file mode 100644 index 000000000..5352a8f03 --- /dev/null +++ b/releasenotes/notes/remove-taas-agent-vlan-range-ead775345674ae97.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The following parameters of the ``neutron::agents::taas`` class have been + removed. + + - ``vlan_range_start`` + - ``vlan_range_end`` + diff --git a/spec/classes/neutron_agents_taas_spec.rb b/spec/classes/neutron_agents_taas_spec.rb index e596469e5..fc4225e2a 100644 --- a/spec/classes/neutron_agents_taas_spec.rb +++ b/spec/classes/neutron_agents_taas_spec.rb @@ -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('') - should contain_neutron_plugin_ml2('taas/vlan_range_start').with_value('') - should contain_neutron_plugin_ml2('taas/vlan_range_end').with_value('') 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