openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "ODL: Remove deprecated ovsdb_connection"

This commit is contained in:
Zuul 2022-05-11 12:01:36 +00:00 committed by Gerrit Code Review
parent dd26802612 d806c5a1bd
commit a837e13ccc
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/plugins/ml2/opendaylight.pp
View File

@ -37,18 +37,11 @@
# (optional) List of ODL features to enable
# Defaults to $::os_service_default
#
# === Deprecated Parameters
#
# [*ovsdb_connection*]
# (optional) Deprecated. The URI used to connect to the local OVSDB server
# Defaults to 'tcp:127.0.0.1:6639'
#
class neutron::plugins::ml2::opendaylight (
$package_ensure = 'present',
$odl_username = $::os_service_default,
$odl_password = $::os_service_default,
$odl_url = $::os_service_default,
$ovsdb_connection = 'tcp:127.0.0.1:6639',
$port_binding_controller = $::os_service_default,
$odl_hostconf_uri = $::os_service_default,
$odl_features = $::os_service_default,
@ -73,11 +66,8 @@ class neutron::plugins::ml2::opendaylight (
'ml2_odl/odl_features': value => join(any2array($odl_features), ',');
}
if $ovsdb_connection != 'tcp:127.0.0.1:6639' {
warning('The ovsdb_connection parameter is deprecated and will be removed in future releases')
}
# TODO(tkajinam): Remove this after Zed release.
neutron_config {
'OVS/ovsdb_connection': value => $ovsdb_connection;
'OVS/ovsdb_connection': ensure => absent;
}
}

5
releasenotes/notes/remove-odl-ovsdb_connection-5718f3e239f4de8f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated ``neutron::plugins::ml2::opendaylight::ovsdb_connection``
parameter has been removed.

5
spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
View File

@ -15,7 +15,6 @@ describe 'neutron::plugins::ml2::opendaylight' do
{
:package_ensure => 'present',
:odl_url => '<SERVICE DEFAULT>',
:ovsdb_connection => 'tcp:127.0.0.1:6639',
:port_binding_controller => '<SERVICE DEFAULT>',
:odl_hostconf_uri => '<SERVICE DEFAULT>',
:odl_features => '<SERVICE DEFAULT>',
@ -49,10 +48,6 @@ describe 'neutron::plugins::ml2::opendaylight' do
should contain_neutron_plugin_ml2('ml2_odl/odl_hostconf_uri').with_value(params[:odl_hostconf_uri])
should contain_neutron_plugin_ml2('ml2_odl/odl_features').with_value(params[:odl_features])
end
it 'configures neutron server settings' do
should contain_neutron_config('OVS/ovsdb_connection').with_value(params[:ovsdb_connection])
end
end
on_supported_os({