Mellanox: Clean up deprecated auth parameters

These parameters were deprecated during Yoga cycle and have no eefect
since then[1].

[1] 8ce1ea3d93
Change-Id: I51f8fe6a24fb37c60cea57ebe0cd095826f8a77f
This commit is contained in:
Takashi Kajinami 2022-05-07 15:37:27 +09:00
parent df0d55cf78
commit a90077cf6d
2 changed files with 21 additions and 40 deletions

View File

@ -36,52 +36,24 @@
# The list must be a subset of physical_networks
# Defaults to []
#
# DEPRECATED PARAMETERS
#
# [*sdn_username*]
# (optional) The Mellanox controller username
# Defaults to undef.
#
# [*sdn_password*]
# (optional) The Mellanox controller password
# Defaults to undef.
#
class neutron::plugins::ml2::mellanox::mlnx_sdn_assist (
$sdn_token = $::os_service_default,
$sdn_url = $::os_service_default,
$sdn_domain = $::os_service_default,
$sync_enabled = true,
$bind_normal_ports = false,
$bind_normal_ports_physnets = [],
# DEPRECATED PARAMETERS
$sdn_username = undef,
$sdn_password = undef,
$sdn_token = $::os_service_default,
$sdn_url = $::os_service_default,
$sdn_domain = $::os_service_default,
$sync_enabled = true,
$bind_normal_ports = false,
$bind_normal_ports_physnets = [],
) {
include neutron::deps
require neutron::plugins::ml2
if $sdn_username != undef {
warning('neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_username is now deprecated \
and has no effect.')
}
if $sdn_password != undef {
warning('neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_password is now deprecated \
and has no effect.')
}
neutron_plugin_ml2 {
'sdn/username': ensure => absent;
'sdn/password ': ensure => absent;
}
neutron_plugin_ml2 {
'sdn/token': value => $sdn_token, secret => true;
'sdn/url': value => $sdn_url;
'sdn/domain': value => $sdn_domain;
'sdn/sync_enabled': value => $sync_enabled;
'sdn/bind_normal_ports': value => $bind_normal_ports;
'sdn/bind_normal_ports_physnets': value => $bind_normal_ports_physnets;
'sdn/token': value => $sdn_token, secret => true;
'sdn/url': value => $sdn_url;
'sdn/domain': value => $sdn_domain;
'sdn/sync_enabled': value => $sync_enabled;
'sdn/bind_normal_ports': value => $bind_normal_ports;
'sdn/bind_normal_ports_physnets': value => $bind_normal_ports_physnets;
}
}

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The following parameters of
the ``neutron::plugins::ml2::mellanox::mlnx_sdn_assist`` class have been
removed.
- ``sdn_username``
- ``sdn_password``