Deprecate the unused quota_network_gateway parameter
The quota_network_gateway parameter was initially implemented as part of the NVP plugin[1], which was later rebranded to vmware plugin[2] and separated from neutron as NSX plugin. However this parameter was later removed from NSX plugin[3] and is no longer used. [1] https://opendev.org/openstack/neutron/commit/4ec58b3da48 [2] https://opendev.org/openstack/neutron/commit/1ba129e6a38 [3] https://opendev.org/x/vmware-nsx/commit/79275a99820 Change-Id: Ib421452ced7bc297af9c904849df0977d4a9c386
This commit is contained in:
parent
41e4be6d95
commit
c4afd1f7e7
@ -42,10 +42,6 @@
|
|||||||
# (optional) Default driver to use for quota checks.
|
# (optional) Default driver to use for quota checks.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
# [*quota_network_gateway*]
|
|
||||||
# (optional) Number of network gateways allowed per tenant, -1 for unlimited.
|
|
||||||
# Defaults to '5'.
|
|
||||||
#
|
|
||||||
# [*quota_rbac_policy*]
|
# [*quota_rbac_policy*]
|
||||||
# (optional) Number of rbac policies allowed per tenant.
|
# (optional) Number of rbac policies allowed per tenant.
|
||||||
# A negative value means unlimited.
|
# A negative value means unlimited.
|
||||||
@ -62,6 +58,10 @@
|
|||||||
# A negative value means unlimited.
|
# A negative value means unlimited.
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
|
# [*quota_network_gateway*]
|
||||||
|
# (optional) Number of network gateways 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,
|
||||||
@ -74,12 +74,12 @@ class neutron::quota (
|
|||||||
$quota_security_group = $::os_service_default,
|
$quota_security_group = $::os_service_default,
|
||||||
$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,
|
|
||||||
# rbac extension
|
# rbac extension
|
||||||
$quota_rbac_policy = $::os_service_default,
|
$quota_rbac_policy = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$quota_packet_filter = undef,
|
$quota_packet_filter = undef,
|
||||||
$quota_vip = undef,
|
$quota_vip = undef,
|
||||||
|
$quota_network_gateway = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include neutron::deps
|
include neutron::deps
|
||||||
@ -92,6 +92,13 @@ class neutron::quota (
|
|||||||
warning('The neutron::quota::quota_vip parameter is deprecated and has no effect')
|
warning('The neutron::quota::quota_vip parameter is deprecated and has no effect')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $quota_network_gateway != undef {
|
||||||
|
warning('The neutron::quota::quota_network_gateway parameter is deprecated and has no effect')
|
||||||
|
}
|
||||||
|
neutron_config {
|
||||||
|
'quotas/quota_network_gateway': ensure => absent;
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
@ -102,7 +109,6 @@ class neutron::quota (
|
|||||||
'quotas/quota_security_group': value => $quota_security_group;
|
'quotas/quota_security_group': value => $quota_security_group;
|
||||||
'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_rbac_policy': value => $quota_rbac_policy;
|
'quotas/quota_rbac_policy': value => $quota_rbac_policy;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The ``neutron::quota::quota_network_gateway`` parameter has been deprecated
|
||||||
|
and has no effect now.
|
@ -7,7 +7,14 @@ describe 'neutron::quota' do
|
|||||||
|
|
||||||
let :default_params do
|
let :default_params do
|
||||||
{
|
{
|
||||||
:quota_network_gateway => 5,
|
:quota_network => '<SERVICE DEFAULT>',
|
||||||
|
:quota_subnet => '<SERVICE DEFAULT>',
|
||||||
|
:quota_port => '<SERVICE DEFAULT>',
|
||||||
|
:quota_router => '<SERVICE DEFAULT>',
|
||||||
|
:quota_floatingip => '<SERVICE DEFAULT>',
|
||||||
|
:quota_security_group => '<SERVICE DEFAULT>',
|
||||||
|
:quota_security_group_rule => '<SERVICE DEFAULT>',
|
||||||
|
:quota_rbac_policy => '<SERVICE DEFAULT>',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -38,7 +45,6 @@ describe 'neutron::quota' do
|
|||||||
:quota_floatingip => 100,
|
:quota_floatingip => 100,
|
||||||
:quota_security_group => 20,
|
:quota_security_group => 20,
|
||||||
:quota_security_group_rule => 200,
|
:quota_security_group_rule => 200,
|
||||||
:quota_network_gateway => 5,
|
|
||||||
:quota_rbac_policy => 10
|
:quota_rbac_policy => 10
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user