Remove remaining parameter of the Nicira NVP plugin

This change removes the remaining parameter of NVP plugin, which was
formally deprecated during the past cycle by [1].

[1] 4117660c38

Change-Id: I99fa84f86d7c14b21393373d4684c24a4571d00d
This commit is contained in:
Takashi Kajinami 2022-11-15 11:00:48 +09:00
parent 3206f2f9c2
commit e0e35b84f4
3 changed files with 4 additions and 9 deletions

View File

@ -83,9 +83,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*plugin_nvp_config*]
# (optional) Manage configuration of /etc/neutron/plugins/nicira/nvp.ini
#
# [*plugin_linuxbridge_config*] # [*plugin_linuxbridge_config*]
# (optional) Manage configuration of linuxbridge_conf.ini # (optional) Manage configuration of linuxbridge_conf.ini
# #
@ -120,7 +117,6 @@ class neutron::config (
$plugin_nuage_config = {}, $plugin_nuage_config = {},
$plugin_ml2_config = {}, $plugin_ml2_config = {},
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$plugin_nvp_config = undef,
$plugin_linuxbridge_config = undef, $plugin_linuxbridge_config = undef,
$plugin_nsx_config = undef, $plugin_nsx_config = undef,
$linuxbridge_agent_config = undef, $linuxbridge_agent_config = undef,
@ -128,10 +124,6 @@ class neutron::config (
include neutron::deps include neutron::deps
if $plugin_nvp_config != undef {
warning('The plugin_nvp_config parameter is deprecated and has no effect.')
}
if $plugin_linuxbridge_config != undef { if $plugin_linuxbridge_config != undef {
warning('The plugin_linuxbridge_config parameter is deprecated and has no effect.') warning('The plugin_linuxbridge_config parameter is deprecated and has no effect.')
} }

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``neutron::config::plugin_nvp_config`` parameter has been removed.

View File

@ -44,7 +44,6 @@ describe 'basic neutron_config resource' do
'/etc/neutron/plugins', '/etc/neutron/plugins',
'/etc/neutron/plugins/linuxbridge', '/etc/neutron/plugins/linuxbridge',
'/etc/neutron/plugins/ml2', '/etc/neutron/plugins/ml2',
'/etc/neutron/plugins/nicira',
'/etc/neutron/plugins/opencontrail', '/etc/neutron/plugins/opencontrail',
'/etc/neutron/plugins/vmware'] '/etc/neutron/plugins/vmware']