From 58f1d6a5255d06b9493af7efd389eabe07c08607 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 7 Sep 2021 23:56:46 +0900
Subject: [PATCH] Remove deprecated quota parameters

The quota parameters for LBaaS[1] and FWaaS[2] were deprecated during
the previous cycle, so can be removed now.

[1] 4ca9ac106243433eebca1492218d72718617d1d0
[2] 1e2c71d36db1126387ae93dc4116313b0b998932

Change-Id: Ib9b255c5dd63bb7d7d9d7fd9347e35287940caaa
---
 manifests/quota.pp                            | 53 -------------------
 ...up-quota-params-xena-c8cb406ad013c5d4.yaml | 13 +++++
 2 files changed, 13 insertions(+), 53 deletions(-)
 create mode 100644 releasenotes/notes/cleanup-quota-params-xena-c8cb406ad013c5d4.yaml

diff --git a/manifests/quota.pp b/manifests/quota.pp
index 02abced6b..d135571c1 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -60,40 +60,6 @@
 #   A negative value means unlimited.
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*quota_loadbalancer*]
-#   (optional) Number of loadbalancers allowed per tenant.
-#   A negative value means unlimited.
-#   Defaults to undef.
-#
-# [*quota_pool*]
-#   (optional) Number of pools allowed per tenant.
-#   A negative value means unlimited.
-#   Defaults to undef.
-#
-# [*quota_member*]
-#   (optional) Number of pool members allowed per tenant.
-#   A negative value means unlimited
-#   Defaults to undef.
-#
-# [*quota_healthmonitor*]
-#   (optional) Number of health monitors allowed per tenant.
-#   A negative value means unlimited.
-#   Defaults to undef.
-#
-# [*quota_firewall*]
-#   (optional) Number of firewalls allowed per tenant, -1 for unlimited.
-#   Defaults to undef.
-#
-# [*quota_firewall_policy*]
-#   (optional) Number of firewalls policies allowed per tenant, -1 for unlimited.
-#   Defaults to undef.
-#
-# [*quota_firewall_rule*]
-#   (optional) Number of firewalls rules allowed per tenant, -1 for unlimited.
-#   Defaults to undef.
-#
 class neutron::quota (
   $default_quota             = $::os_service_default,
   $quota_network             = $::os_service_default,
@@ -111,29 +77,10 @@ class neutron::quota (
   $quota_vip                 = $::os_service_default,
   # rbac extension
   $quota_rbac_policy         = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $quota_loadbalancer        = undef,
-  $quota_pool                = undef,
-  $quota_member              = undef,
-  $quota_healthmonitor       = undef,
-  $quota_firewall            = undef,
-  $quota_firewall_policy     = undef,
-  $quota_firewall_rule       = undef,
 ) {
 
   include neutron::deps
 
-  $deprecated_param_names = [
-    'quota_loadbalancer', 'quota_pool', 'quota_member', 'quota_healthmonitor',
-    'quota_firewall', 'quota_firewall_policy', 'quota_firewall_rule'
-  ]
-  $deprecated_param_names.each |$param_name| {
-    $param = getvar($param_name)
-    if $param != undef {
-      warning("The ${param_name} parameter has been deprecated and has no effect")
-    }
-  }
-
   neutron_config {
     'quotas/default_quota':             value => $default_quota;
     'quotas/quota_network':             value => $quota_network;
diff --git a/releasenotes/notes/cleanup-quota-params-xena-c8cb406ad013c5d4.yaml b/releasenotes/notes/cleanup-quota-params-xena-c8cb406ad013c5d4.yaml
new file mode 100644
index 000000000..ab77c9f52
--- /dev/null
+++ b/releasenotes/notes/cleanup-quota-params-xena-c8cb406ad013c5d4.yaml
@@ -0,0 +1,13 @@
+---
+upgrade:
+  - |
+    The following deprecated parameters of the ``neutron::quota`` class have
+    been removed.
+
+    - ``quota_loadbalancer``
+    - ``quota_pool``
+    - ``quota_member``
+    - ``quota_health_monitor``
+    - ``quota_firewall``
+    - ``quota_firewall_policy``
+    - ``quota_firewall_rule``