Remove deprecated firewall_driver
Depends-On: https://review.opendev.org/743980 Change-Id: Ia2c7c7ca12d381144c87345dde0415a4e775444d
This commit is contained in:
parent
8d7f30c87f
commit
5758b34e4b
@ -123,12 +123,6 @@
|
|||||||
# are 4 and 6.
|
# are 4 and 6.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*firewall_driver*]
|
|
||||||
# (optional) Firewall driver for realizing neutron security group function.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class neutron::plugins::ml2 (
|
class neutron::plugins::ml2 (
|
||||||
$type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
|
$type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
|
||||||
$extension_drivers = $::os_service_default,
|
$extension_drivers = $::os_service_default,
|
||||||
@ -146,19 +140,11 @@ class neutron::plugins::ml2 (
|
|||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
$max_header_size = $::os_service_default,
|
$max_header_size = $::os_service_default,
|
||||||
$overlay_ip_version = $::os_service_default,
|
$overlay_ip_version = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$firewall_driver = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include neutron::deps
|
include neutron::deps
|
||||||
include neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if $firewall_driver != undef {
|
|
||||||
warning('Using "firewall_driver" option in the ml2 plugin is deprecated \
|
|
||||||
and have no any effect. This option should be set in the L2 agent. \
|
|
||||||
It will be removed in the future releases.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! $mechanism_drivers {
|
if ! $mechanism_drivers {
|
||||||
warning('Without networking mechanism driver, ml2 will not communicate with L2 agents')
|
warning('Without networking mechanism driver, ml2 will not communicate with L2 agents')
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated neutron::plugins::ml2::firewall_driver parameter is removed.
|
||||||
|
Please set the firewall_driver in the ML2 agent classes in neutron::agents::ml2 instead.
|
@ -101,7 +101,7 @@ describe 'neutron::plugins::ml2' do
|
|||||||
:enable_security_group => true,
|
:enable_security_group => true,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
it 'configures enable_security_group and firewall_driver options' do
|
it 'configures enable_security_group' do
|
||||||
should contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('true')
|
should contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('true')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user