From 528290ea2bb6c402d615bb092fc849633d421494 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 8 Sep 2021 00:04:14 +0900
Subject: [PATCH] Deprecate the useless quota_packet_filter parameter

The quota_packet_filter parameter is no longer used in core neutron.
The parameter was used by NEC OpenFlow plugin but the plugin was
migrated to an independent repository[1][2].

Currently puppet-neutron doesn't support the plugin so the parameter
is no longer used in a deployment managed by puppet-neutron.

Because we haven't seen any interest in adding support for the plugin
and the plugin itself has not been updated for a while, let's deprecate
the useless parameter so that we can remove it in the next cycle.

[1] https://opendev.org/x/networking-nec
[2] cfa8f537710d8d7ef407b4194295f15ed03b3fa0

Change-Id: I355526f41f8ec17498dc79a5849f90e5385ccc4e
---
 manifests/quota.pp                             | 18 ++++++++++++------
 ...e-quota-packet_filter-e4410c17d00b182b.yaml |  5 +++++
 spec/classes/neutron_quota_spec.rb             |  2 --
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-quota-packet_filter-e4410c17d00b182b.yaml

diff --git a/manifests/quota.pp b/manifests/quota.pp
index d135571c1..e7429474d 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -46,10 +46,6 @@
 #   (optional) Number of network gateways allowed per tenant, -1 for unlimited.
 #   Defaults to '5'.
 #
-# [*quota_packet_filter*]
-#   (optional) Number of packet_filters allowed per tenant, -1 for unlimited.
-#   Defaults to '100'.
-#
 # [*quota_vip*]
 #   (optional) Number of vips allowed per tenant.
 #   A negative value means unlimited.
@@ -60,6 +56,12 @@
 #   A negative value means unlimited.
 #   Defaults to $::os_service_default.
 #
+# DEPRECATED PARAMETERS
+#
+# [*quota_packet_filter*]
+#   (optional) Number of packet_filters allowed per tenant, -1 for unlimited.
+#   Defaults to undef.
+#
 class neutron::quota (
   $default_quota             = $::os_service_default,
   $quota_network             = $::os_service_default,
@@ -73,14 +75,19 @@ class neutron::quota (
   $quota_security_group_rule = $::os_service_default,
   $quota_driver              = $::os_service_default,
   $quota_network_gateway     = 5,
-  $quota_packet_filter       = 100,
   $quota_vip                 = $::os_service_default,
   # rbac extension
   $quota_rbac_policy         = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $quota_packet_filter       = undef,
 ) {
 
   include neutron::deps
 
+  if $quota_packet_filter != undef {
+    warning('The neutron::quota::quota_packet_filter parameter is deprecated and has no effect')
+  }
+
   neutron_config {
     'quotas/default_quota':             value => $default_quota;
     'quotas/quota_network':             value => $quota_network;
@@ -92,7 +99,6 @@ class neutron::quota (
     'quotas/quota_security_group_rule': value => $quota_security_group_rule;
     'quotas/quota_driver':              value => $quota_driver;
     'quotas/quota_network_gateway':     value => $quota_network_gateway;
-    'quotas/quota_packet_filter':       value => $quota_packet_filter;
     'quotas/quota_vip':                 value => $quota_vip;
     'quotas/quota_rbac_policy':         value => $quota_rbac_policy;
   }
diff --git a/releasenotes/notes/deprecate-quota-packet_filter-e4410c17d00b182b.yaml b/releasenotes/notes/deprecate-quota-packet_filter-e4410c17d00b182b.yaml
new file mode 100644
index 000000000..864f2e8d6
--- /dev/null
+++ b/releasenotes/notes/deprecate-quota-packet_filter-e4410c17d00b182b.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``neutron::quota::quota_packet_filter`` parameter has been deprecated
+    and has no effect now.
diff --git a/spec/classes/neutron_quota_spec.rb b/spec/classes/neutron_quota_spec.rb
index 85fc438c0..2547d168b 100644
--- a/spec/classes/neutron_quota_spec.rb
+++ b/spec/classes/neutron_quota_spec.rb
@@ -8,7 +8,6 @@ describe 'neutron::quota' do
   let :default_params do
     {
       :quota_network_gateway => 5,
-      :quota_packet_filter   => 100
     }
   end
 
@@ -40,7 +39,6 @@ describe 'neutron::quota' do
           :quota_security_group      => 20,
           :quota_security_group_rule => 200,
           :quota_network_gateway     => 5,
-          :quota_packet_filter       => 100,
           :quota_vip                 => 10,
           :quota_rbac_policy         => 10
         })