From a90077cf6d8d108ca3d0eee270a6020679e75193 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 7 May 2022 15:37:27 +0900
Subject: [PATCH] Mellanox: Clean up deprecated auth parameters

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

[1] 8ce1ea3d936856354beff4a8df18d05fd5e2c6c7
Change-Id: I51f8fe6a24fb37c60cea57ebe0cd095826f8a77f
---
 .../plugins/ml2/mellanox/mlnx_sdn_assist.pp   | 52 +++++--------------
 ...ellanox-auth-cleanup-b8c0da36636c6542.yaml |  9 ++++
 2 files changed, 21 insertions(+), 40 deletions(-)
 create mode 100644 releasenotes/notes/mellanox-auth-cleanup-b8c0da36636c6542.yaml

diff --git a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
index 6b42fd949..1cad50061 100644
--- a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
+++ b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
@@ -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;
   }
 }
diff --git a/releasenotes/notes/mellanox-auth-cleanup-b8c0da36636c6542.yaml b/releasenotes/notes/mellanox-auth-cleanup-b8c0da36636c6542.yaml
new file mode 100644
index 000000000..dcccc9e30
--- /dev/null
+++ b/releasenotes/notes/mellanox-auth-cleanup-b8c0da36636c6542.yaml
@@ -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``