openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate the removed quota options"

This commit is contained in:
Zuul 2021-01-27 08:23:38 +00:00 committed by Gerrit Code Review
parent 19b70a1525 9b050f1a67
commit 98af54f9b9
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/quota.pp
View File

@ -60,17 +60,19 @@
# (optional) Number of servers per server group
# Defaults to 10
#
# DEPRECATED PARAMETERS
#
# [*reservation_expire*]
# (optional) Time until reservations expire in seconds
# Defaults to 86400
# Defaults to undef
#
# [*until_refresh*]
# (optional) Count of reservations until usage is refreshed
# Defaults to 0
# Defaults to undef
#
# [*max_age*]
# (optional) Number of seconds between subsequent usage refreshes
# Defaults to 0
# Defaults to undef
#
class nova::quota(
$instances = 10,
@ -87,13 +89,24 @@ class nova::quota(
$key_pairs = 100,
$server_groups = 10,
$server_group_members = 10,
$reservation_expire = 86400,
$until_refresh = 0,
$max_age = 0,
# DEPRECATED PARAMETERS
$reservation_expire = undef,
$until_refresh = undef,
$max_age = undef,
) {
include nova::deps
[
'reservation_expire',
'until_refresh',
'max_age',
].each |String $removed_opt| {
if getvar("${removed_opt}") != undef {
warning("The ${removed_opt} parameter is deprecated and has no effect")
}
}
nova_config {
'quota/instances': value => $instances;
'quota/cores': value => $cores;
@ -109,8 +122,11 @@ class nova::quota(
'quota/key_pairs': value => $key_pairs;
'quota/server_groups': value => $server_groups;
'quota/server_group_members': value => $server_group_members;
'quota/reservation_expire': value => $reservation_expire;
'quota/until_refresh': value => $until_refresh;
'quota/max_age': value => $max_age;
}
nova_config {
'quota/reservation_expire': ensure => absent;
'quota/until_refresh': ensure => absent;
'quota/max_age': ensure => absent;
}
}

10
releasenotes/notes/deprecate-removed-quota-opts-4827f4022a67d06b.yaml Normal file
View File

@ -0,0 +1,10 @@
---
deprecations:
- |
The following parameters of the ``nova::quota`` class have been deprecated
and have no effect now. These parameters will be removed in a future
release.
- ``reservation_expire``
- ``until_refresh``
- ``max_age``

6
spec/classes/nova_quota_spec.rb
View File

@ -21,9 +21,6 @@ describe 'nova::quota' do
:key_pairs => 100,
:server_groups => 10,
:server_group_members => 10,
:reservation_expire => 86400,
:until_refresh => 0,
:max_age => 0
}
end
@ -61,9 +58,6 @@ describe 'nova::quota' do
:key_pairs => 200,
:server_groups => 20,
:server_group_members => 20,
:reservation_expire => 6400,
:until_refresh => 30,
:max_age => 60
})
end