ODL: Remove deprecated ovsdb_connection
This parameter was deprecated several cycles ago[1], and has been kept
for enough cycles to inform removal.
[1] 094e594d40
Change-Id: I9bb7007a4508af302c94797de0d0770429884f86
This commit is contained in:
@@ -37,18 +37,11 @@
|
|||||||
# (optional) List of ODL features to enable
|
# (optional) List of ODL features to enable
|
||||||
# Defaults to $::os_service_default
|
# 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 (
|
class neutron::plugins::ml2::opendaylight (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$odl_username = $::os_service_default,
|
$odl_username = $::os_service_default,
|
||||||
$odl_password = $::os_service_default,
|
$odl_password = $::os_service_default,
|
||||||
$odl_url = $::os_service_default,
|
$odl_url = $::os_service_default,
|
||||||
$ovsdb_connection = 'tcp:127.0.0.1:6639',
|
|
||||||
$port_binding_controller = $::os_service_default,
|
$port_binding_controller = $::os_service_default,
|
||||||
$odl_hostconf_uri = $::os_service_default,
|
$odl_hostconf_uri = $::os_service_default,
|
||||||
$odl_features = $::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), ',');
|
'ml2_odl/odl_features': value => join(any2array($odl_features), ',');
|
||||||
}
|
}
|
||||||
|
|
||||||
if $ovsdb_connection != 'tcp:127.0.0.1:6639' {
|
# TODO(tkajinam): Remove this after Zed release.
|
||||||
warning('The ovsdb_connection parameter is deprecated and will be removed in future releases')
|
|
||||||
}
|
|
||||||
|
|
||||||
neutron_config {
|
neutron_config {
|
||||||
'OVS/ovsdb_connection': value => $ovsdb_connection;
|
'OVS/ovsdb_connection': ensure => absent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated ``neutron::plugins::ml2::opendaylight::ovsdb_connection``
|
||||||
|
parameter has been removed.
|
@@ -15,7 +15,6 @@ describe 'neutron::plugins::ml2::opendaylight' do
|
|||||||
{
|
{
|
||||||
:package_ensure => 'present',
|
:package_ensure => 'present',
|
||||||
:odl_url => '<SERVICE DEFAULT>',
|
:odl_url => '<SERVICE DEFAULT>',
|
||||||
:ovsdb_connection => 'tcp:127.0.0.1:6639',
|
|
||||||
:port_binding_controller => '<SERVICE DEFAULT>',
|
:port_binding_controller => '<SERVICE DEFAULT>',
|
||||||
:odl_hostconf_uri => '<SERVICE DEFAULT>',
|
:odl_hostconf_uri => '<SERVICE DEFAULT>',
|
||||||
:odl_features => '<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_hostconf_uri').with_value(params[:odl_hostconf_uri])
|
||||||
should contain_neutron_plugin_ml2('ml2_odl/odl_features').with_value(params[:odl_features])
|
should contain_neutron_plugin_ml2('ml2_odl/odl_features').with_value(params[:odl_features])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures neutron server settings' do
|
|
||||||
should contain_neutron_config('OVS/ovsdb_connection').with_value(params[:ovsdb_connection])
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
|
Reference in New Issue
Block a user