OVN: Clean up deprecated parameters
The ovn_l3_mode parameter[1] and the vif_type parameter[2] were deprecated during Wallaby cycle, so these are ready to be removed. [1]4f09774c6b
[2]1ba7a40514
Change-Id: I29083f796d6ee0436785310210b7eb84af1ee5d4
This commit is contained in:
parent
47ee9cb8cb
commit
06d4e54084
@ -69,11 +69,6 @@
|
|||||||
# that are no longer in Neutron.
|
# that are no longer in Neutron.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# [*vif_type*]
|
|
||||||
# (optional) Type of VIF to be used for ports.
|
|
||||||
# Valid values are 'ovs', 'vhostuser'
|
|
||||||
# Defaults to $::os_service_default
|
|
||||||
#
|
|
||||||
# [*ovn_metadata_enabled*]
|
# [*ovn_metadata_enabled*]
|
||||||
# (optional) Whether to enable metadata service in OVN.
|
# (optional) Whether to enable metadata service in OVN.
|
||||||
# Type: boolean
|
# Type: boolean
|
||||||
@ -122,14 +117,6 @@
|
|||||||
# Used by logging service plugin.
|
# Used by logging service plugin.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*ovn_l3_mode*]
|
|
||||||
# (optional) Whether to use OVN native L3 support. Do not change the
|
|
||||||
# value for existing deployments that contain routers.
|
|
||||||
# Type: boolean
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class neutron::plugins::ml2::ovn(
|
class neutron::plugins::ml2::ovn(
|
||||||
$ovn_nb_connection = $::os_service_default,
|
$ovn_nb_connection = $::os_service_default,
|
||||||
$ovn_sb_connection = $::os_service_default,
|
$ovn_sb_connection = $::os_service_default,
|
||||||
@ -152,22 +139,11 @@ class neutron::plugins::ml2::ovn(
|
|||||||
$network_log_rate_limit = $::os_service_default,
|
$network_log_rate_limit = $::os_service_default,
|
||||||
$network_log_burst_limit = $::os_service_default,
|
$network_log_burst_limit = $::os_service_default,
|
||||||
$network_log_local_output_log_base = $::os_service_default,
|
$network_log_local_output_log_base = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$ovn_l3_mode = undef,
|
|
||||||
$vif_type = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include neutron::deps
|
include neutron::deps
|
||||||
require neutron::plugins::ml2
|
require neutron::plugins::ml2
|
||||||
|
|
||||||
if $ovn_l3_mode != undef {
|
|
||||||
warning('The ovn_l3_mode parameter has been deprecated and has no effect')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $vif_type != undef {
|
|
||||||
warning('The vif_type parameter has been deprecated and has no effect')
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! ( $neutron_sync_mode in ['off', 'log', 'repair', $::os_service_default] ) {
|
if ! ( $neutron_sync_mode in ['off', 'log', 'repair', $::os_service_default] ) {
|
||||||
fail( 'Invalid value for neutron_sync_mode parameter' )
|
fail( 'Invalid value for neutron_sync_mode parameter' )
|
||||||
}
|
}
|
||||||
@ -194,10 +170,4 @@ class neutron::plugins::ml2::ovn(
|
|||||||
'network_log/burst_limit' : value => $network_log_burst_limit;
|
'network_log/burst_limit' : value => $network_log_burst_limit;
|
||||||
'network_log/local_output_log_base' : value => $network_log_local_output_log_base;
|
'network_log/local_output_log_base' : value => $network_log_local_output_log_base;
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO(tkajinam): Remove this when removing the deprecated parameters
|
|
||||||
neutron_plugin_ml2 {
|
|
||||||
'ovn/ovn_l3_mode' : ensure => absent;
|
|
||||||
'ovn/vif_type' : ensure => absent;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following parameters of the ``neutron::plugins::ml2::ovn`` class have
|
||||||
|
been removed.
|
||||||
|
|
||||||
|
- ``ovn_l3_mode``
|
||||||
|
- ``vif_type``
|
Loading…
Reference in New Issue
Block a user