From 9e94d0e08b10cf31e777e1f971fca8a0bbd5488f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 21 Jul 2021 06:28:15 +0000
Subject: [PATCH] Revert "Deprecate support for networking-mlnx"

This reverts commit faec067d3798836ca971a8324b582a1926e8f609.

Reason for revert:
It was confirmed that the plugin will be still maintained. Releases
for Victoria and Wallaby were created an job templates were updated to
be consistent with branches in neutron repos.

Change-Id: I12c9deae9b69467845e084fc5991d004a981c339
---
 manifests/agents/ml2/mlnx.pp                                 | 2 --
 manifests/plugins/ml2/mellanox.pp                            | 4 ----
 manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp            | 4 ----
 .../notes/deprecate-networking-mlnx-1585b2f692e2cfe5.yaml    | 5 -----
 4 files changed, 15 deletions(-)
 delete mode 100644 releasenotes/notes/deprecate-networking-mlnx-1585b2f692e2cfe5.yaml

diff --git a/manifests/agents/ml2/mlnx.pp b/manifests/agents/ml2/mlnx.pp
index 1e93dac23..420891794 100644
--- a/manifests/agents/ml2/mlnx.pp
+++ b/manifests/agents/ml2/mlnx.pp
@@ -1,7 +1,6 @@
 #
 # == Class: neutron::agents::ml2::mlnx
 #
-# DEPRECATED !
 # Setups MLNX neutron agent when using ML2 plugin
 #
 # === Parameters
@@ -74,7 +73,6 @@ class neutron::agents::ml2::mlnx (
   $ipoib_physical_interface                        = $::os_service_default,
   $enable_multi_interface_driver_cache_maintenance = false,
 ) {
-  warning('Support for networking-mlnx has been deprecated')
 
   include neutron::deps
   include neutron::params
diff --git a/manifests/plugins/ml2/mellanox.pp b/manifests/plugins/ml2/mellanox.pp
index e8adea0a5..9d55725b9 100644
--- a/manifests/plugins/ml2/mellanox.pp
+++ b/manifests/plugins/ml2/mellanox.pp
@@ -1,7 +1,4 @@
 #
-# == Class: neutron::plugins::ml2::mellanox
-#
-# DEPRECATED !
 # Install the Mellanox plugins and generate the config file
 # from parameters in the other classes.
 #
@@ -17,7 +14,6 @@
 class neutron::plugins::ml2::mellanox (
   $package_ensure = 'present'
 ) {
-  warning('Support for networking-mlnx has been deprecated')
 
   include neutron::deps
   include neutron::params
diff --git a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
index 2e8bcfa33..1d2a5ad8a 100644
--- a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
+++ b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
@@ -1,7 +1,4 @@
 #
-# == Class: neutron::plugins::ml2::mellanox::mlnx_sdn_assist
-#
-# DEPRECATED !
 # Install the OpenDaylight and generate config file
 # from parameters in the other classes.
 #
@@ -53,7 +50,6 @@ class neutron::plugins::ml2::mellanox::mlnx_sdn_assist (
   $bind_normal_ports            = false,
   $bind_normal_ports_physnets   = [],
 ) {
-  warning('Support for networking-mlnx has been deprecated')
 
   include neutron::deps
   require neutron::plugins::ml2
diff --git a/releasenotes/notes/deprecate-networking-mlnx-1585b2f692e2cfe5.yaml b/releasenotes/notes/deprecate-networking-mlnx-1585b2f692e2cfe5.yaml
deleted file mode 100644
index e16f9680a..000000000
--- a/releasenotes/notes/deprecate-networking-mlnx-1585b2f692e2cfe5.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-deprecations:
-  - |
-    Support for networking-mlnx has been deprecated and will be removed in
-    a future release.