openstack/puppet-neutron
Code Issues Proposed changes

Deprecate the useless quota_packet_filter parameter

Browse Source 
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
This commit is contained in:
Takashi Kajinami 2021-09-08 00:04:14 +09:00
parent 58f1d6a525
commit 528290ea2b
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/quota.pp
View File

@ -46,10 +46,6 @@
# (optional) Number of network gateways allowed per tenant, -1 for unlimited. # (optional) Number of network gateways allowed per tenant, -1 for unlimited.
# Defaults to '5'. # Defaults to '5'.
# #
# [*quota_packet_filter*]
# (optional) Number of packet_filters allowed per tenant, -1 for unlimited.
# Defaults to '100'.
#
# [*quota_vip*] # [*quota_vip*]
# (optional) Number of vips allowed per tenant. # (optional) Number of vips allowed per tenant.
# A negative value means unlimited. # A negative value means unlimited.
@ -60,6 +56,12 @@
# A negative value means unlimited. # A negative value means unlimited.
# Defaults to $::os_service_default. # 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 ( class neutron::quota (
$default_quota = $::os_service_default, $default_quota = $::os_service_default,
$quota_network = $::os_service_default, $quota_network = $::os_service_default,
@ -73,14 +75,19 @@ class neutron::quota (
$quota_security_group_rule = $::os_service_default, $quota_security_group_rule = $::os_service_default,
$quota_driver = $::os_service_default, $quota_driver = $::os_service_default,
$quota_network_gateway = 5, $quota_network_gateway = 5,
$quota_packet_filter = 100,
$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_packet_filter = undef,
) { ) {
include neutron::deps include neutron::deps
if $quota_packet_filter != undef {
warning('The neutron::quota::quota_packet_filter parameter is 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;
@ -92,7 +99,6 @@ class neutron::quota (
'quotas/quota_security_group_rule': value => $quota_security_group_rule; 'quotas/quota_security_group_rule': value => $quota_security_group_rule;
'quotas/quota_driver': value => $quota_driver; 'quotas/quota_driver': value => $quota_driver;
'quotas/quota_network_gateway': value => $quota_network_gateway; 'quotas/quota_network_gateway': value => $quota_network_gateway;
'quotas/quota_packet_filter': value => $quota_packet_filter;
'quotas/quota_vip': value => $quota_vip; 'quotas/quota_vip': value => $quota_vip;
'quotas/quota_rbac_policy': value => $quota_rbac_policy; 'quotas/quota_rbac_policy': value => $quota_rbac_policy;
} }

5
releasenotes/notes/deprecate-quota-packet_filter-e4410c17d00b182b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``neutron::quota::quota_packet_filter`` parameter has been deprecated
and has no effect now.

2
spec/classes/neutron_quota_spec.rb
View File

@ -8,7 +8,6 @@ describe 'neutron::quota' do
let :default_params do let :default_params do
{ {
:quota_network_gateway => 5, :quota_network_gateway => 5,
:quota_packet_filter => 100
} }
end end
@ -40,7 +39,6 @@ describe 'neutron::quota' do
:quota_security_group => 20, :quota_security_group => 20,
:quota_security_group_rule => 200, :quota_security_group_rule => 200,
:quota_network_gateway => 5, :quota_network_gateway => 5,
:quota_packet_filter => 100,
:quota_vip => 10, :quota_vip => 10,
:quota_rbac_policy => 10 :quota_rbac_policy => 10
}) })