From 28ca6097fcdb92998d0e14d8f2b110e8263beb13 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 10 Oct 2020 13:02:13 +0900
Subject: [PATCH] Deprecate duplicated parameters for vnic_type_blacklist

... because now the vnic_type_blacklist parameters are implemeted in
ovs_driver and sriov_driver class.

Change-Id: Iaa52568d7a1c8bde97a24e87ead863c46a28b408
---
 manifests/plugins/ml2/mech_driver.pp          | 23 ++++++++++++-------
 ...e-mech_driver-params-68968b6585278946.yaml |  9 ++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml

diff --git a/manifests/plugins/ml2/mech_driver.pp b/manifests/plugins/ml2/mech_driver.pp
index 3c1d8b0e5..77e3b0a8b 100644
--- a/manifests/plugins/ml2/mech_driver.pp
+++ b/manifests/plugins/ml2/mech_driver.pp
@@ -23,6 +23,8 @@
 #   (required) Supported PCI vendor devices, defined by vendor_id:product_id according
 #   to the PCI ID Repository. Default enables support for Intel and Mellanox SR-IOV capable NICs
 #
+# DEPRECATED PARAMETERS
+#
 # [*ovs_vnic_type_blacklist*]
 #  (optional) list of VNIC types for which support in Neutron is
 #  administratively prohibited by the OVS mechanism driver
@@ -33,8 +35,9 @@
 #
 define neutron::plugins::ml2::mech_driver (
   $supported_pci_vendor_devs,
-  $ovs_vnic_type_blacklist      = [],
-  $sriov_vnic_type_blacklist    = [],
+  # DEPRECATED PARAMETERS
+  $ovs_vnic_type_blacklist      = undef,
+  $sriov_vnic_type_blacklist    = undef,
 ){
 
   include neutron::deps
@@ -62,15 +65,19 @@ define neutron::plugins::ml2::mech_driver (
     }
   }
 
-  if ($ovs_vnic_type_blacklist != []) {
-    neutron_plugin_ml2 {
-      'ovs_driver/vnic_type_blacklist': value => join(any2array($ovs_vnic_type_blacklist), ',');
+  if ($ovs_vnic_type_blacklist != undef) {
+    warning('neutron::plugins::ml2::mech_driver::ovs_vnic_type_blacklist has been \
+deperecated. Use neutron::plugins::ml2::ovs_driver class')
+    class { 'neutron::plugins::ml2::ovs_driver':
+      vnic_type_blacklist => $ovs_vnic_type_blacklist
     }
   }
 
-  if ($sriov_vnic_type_blacklist != []) {
-    neutron_plugin_ml2 {
-      'sriov_driver/vnic_type_blacklist': value => join(any2array($sriov_vnic_type_blacklist), ',');
+  if ($sriov_vnic_type_blacklist != undef) {
+    warning('neutron::plugins::ml2::mech_driver::sriov_vnic_type_blacklist has been \
+deperecated. Use neutron::plugins::ml2::sriov_driver class')
+    class { 'neutron::plugins::ml2::sriov_vnic_type_blacklist':
+      vnic_type_blacklist => $sriov_vnic_type_blacklist
     }
   }
 }
diff --git a/releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml b/releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml
new file mode 100644
index 000000000..578f2caf6
--- /dev/null
+++ b/releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml
@@ -0,0 +1,9 @@
+---
+deprecations:
+  - |
+    The following parameters in the ``neutron::plugins::ml2:mech_driver`` class
+    have been deprecated and will be removed in a future release.
+    Use ``ovs_driver`` class or ``sriov_driver`` class instead.
+
+    - ``ovs_vnic_type_blacklist``
+    - ``sriov_vnic_type_blacklist``