openstack/puppet-neutron
Code Issues Proposed changes

Remove deprecated quota parameters

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

[1] 4ca9ac1062
[2] 1e2c71d36d

Change-Id: Ib9b255c5dd63bb7d7d9d7fd9347e35287940caaa
This commit is contained in:
Takashi Kajinami 2021-09-07 23:56:46 +09:00
parent dae33092a1
commit 58f1d6a525
2 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
manifests/quota.pp
View File

@ -60,40 +60,6 @@
# A negative value means unlimited. # A negative value means unlimited.
# Defaults to $::os_service_default. # 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 ( class neutron::quota (
$default_quota = $::os_service_default, $default_quota = $::os_service_default,
$quota_network = $::os_service_default, $quota_network = $::os_service_default,
@ -111,29 +77,10 @@ class neutron::quota (
$quota_vip = $::os_service_default, $quota_vip = $::os_service_default,
# rbac extension # rbac extension
$quota_rbac_policy = $::os_service_default, $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 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 { neutron_config {
'quotas/default_quota': value => $default_quota; 'quotas/default_quota': value => $default_quota;
'quotas/quota_network': value => $quota_network; 'quotas/quota_network': value => $quota_network;

13
releasenotes/notes/cleanup-quota-params-xena-c8cb406ad013c5d4.yaml Normal file
View File

@ -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``