openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Mellanox: Clean up deprecated auth parameters"

This commit is contained in:
Zuul 2022-05-11 11:44:18 +00:00 committed by Gerrit Code Review
parent 1e7da3c382 a90077cf6d
commit 452b37ac37
2 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
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;
}
}

9
releasenotes/notes/mellanox-auth-cleanup-b8c0da36636c6542.yaml Normal file
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``