Remove deprecated quota parameters

... because these were deprecated during the Wallaby cycle[1][2].

[1] 9b050f1a67
[2] e57eebdc97

Change-Id: I804046b82eb39478a5415ef7d34ed0fdb19b9ab1
This commit is contained in:
Takashi Kajinami 2022-04-10 18:56:20 +09:00
parent d927147bd1
commit a8d00ff718
2 changed files with 12 additions and 62 deletions

View File

@ -53,36 +53,6 @@
# quota to be exceeded.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*reservation_expire*]
# (optional) Time until reservations expire in seconds
# Defaults to undef
#
# [*until_refresh*]
# (optional) Count of reservations until usage is refreshed
# Defaults to undef
#
# [*max_age*]
# (optional) Number of seconds between subsequent usage refreshes
# Defaults to undef
#
# [*floating_ips*]
# (optional) Number of floating IPs
# Defaults to undef
#
# [*fixed_ips*]
# (optional) Number of fixed IPs (this should be at least the number of instances allowed)
# Defaults to undef
#
# [*security_groups*]
# (optional) Number of security groups
# Defaults to undef
#
# [*security_group_rules*]
# (optional) Number of security group rules
# Defaults to undef
#
class nova::quota(
$driver = $::os_service_default,
$instances = $::os_service_default,
@ -96,32 +66,10 @@ class nova::quota(
$server_groups = $::os_service_default,
$server_group_members = $::os_service_default,
$recheck_quota = $::os_service_default,
# DEPRECATED PARAMETERS
$reservation_expire = undef,
$until_refresh = undef,
$max_age = undef,
$floating_ips = undef,
$fixed_ips = undef,
$security_groups = undef,
$security_group_rules = undef,
) {
include nova::deps
[
'reservation_expire',
'until_refresh',
'max_age',
'floating_ips',
'fixed_ips',
'security_groups',
'security_group_rules',
].each |String $removed_opt| {
if getvar("${removed_opt}") != undef {
warning("The ${removed_opt} parameter is deprecated and has no effect")
}
}
nova_config {
'quota/driver': value => $driver;
'quota/instances': value => $instances;
@ -136,14 +84,4 @@ class nova::quota(
'quota/server_group_members': value => $server_group_members;
'quota/recheck_quota': value => $recheck_quota;
}
nova_config {
'quota/reservation_expire': ensure => absent;
'quota/until_refresh': ensure => absent;
'quota/max_age': ensure => absent;
'quota/floating_ips': ensure => absent;
'quota/fixed_ips': ensure => absent;
'quota/security_groups': ensure => absent;
'quota/security_group_rules': ensure => absent;
}
}

View File

@ -0,0 +1,12 @@
---
upgrade:
- |
The following parameters of the ``nova::quota`` class have been removed.
- ``reservation_expire``
- ``until_refresh``
- ``max_age``
- ``floating_ips``
- ``fixed_ips``
- ``security_groups``
- ``security_group_rules``