Deprecate the removed quota options
The following three options were already removed from nova[1], thus we should deprecated and remove these parameters from puppet-nova, too. - reservation_expire - until_refresh - max_age [1] 4743b08f47d5058f557d923736837cee16ecb2e2 Change-Id: I48a2cb72788fa96016ff0e394382fc3f8a54f5b0
This commit is contained in:
@@ -60,17 +60,19 @@
|
|||||||
# (optional) Number of servers per server group
|
# (optional) Number of servers per server group
|
||||||
# Defaults to 10
|
# Defaults to 10
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
# [*reservation_expire*]
|
# [*reservation_expire*]
|
||||||
# (optional) Time until reservations expire in seconds
|
# (optional) Time until reservations expire in seconds
|
||||||
# Defaults to 86400
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
# [*until_refresh*]
|
# [*until_refresh*]
|
||||||
# (optional) Count of reservations until usage is refreshed
|
# (optional) Count of reservations until usage is refreshed
|
||||||
# Defaults to 0
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
# [*max_age*]
|
# [*max_age*]
|
||||||
# (optional) Number of seconds between subsequent usage refreshes
|
# (optional) Number of seconds between subsequent usage refreshes
|
||||||
# Defaults to 0
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class nova::quota(
|
class nova::quota(
|
||||||
$instances = 10,
|
$instances = 10,
|
||||||
@@ -87,13 +89,24 @@ class nova::quota(
|
|||||||
$key_pairs = 100,
|
$key_pairs = 100,
|
||||||
$server_groups = 10,
|
$server_groups = 10,
|
||||||
$server_group_members = 10,
|
$server_group_members = 10,
|
||||||
$reservation_expire = 86400,
|
# DEPRECATED PARAMETERS
|
||||||
$until_refresh = 0,
|
$reservation_expire = undef,
|
||||||
$max_age = 0,
|
$until_refresh = undef,
|
||||||
|
$max_age = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
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 {
|
nova_config {
|
||||||
'quota/instances': value => $instances;
|
'quota/instances': value => $instances;
|
||||||
'quota/cores': value => $cores;
|
'quota/cores': value => $cores;
|
||||||
@@ -109,8 +122,11 @@ class nova::quota(
|
|||||||
'quota/key_pairs': value => $key_pairs;
|
'quota/key_pairs': value => $key_pairs;
|
||||||
'quota/server_groups': value => $server_groups;
|
'quota/server_groups': value => $server_groups;
|
||||||
'quota/server_group_members': value => $server_group_members;
|
'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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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``
|
||||||
@@ -21,9 +21,6 @@ describe 'nova::quota' do
|
|||||||
:key_pairs => 100,
|
:key_pairs => 100,
|
||||||
:server_groups => 10,
|
:server_groups => 10,
|
||||||
:server_group_members => 10,
|
:server_group_members => 10,
|
||||||
:reservation_expire => 86400,
|
|
||||||
:until_refresh => 0,
|
|
||||||
:max_age => 0
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -61,9 +58,6 @@ describe 'nova::quota' do
|
|||||||
:key_pairs => 200,
|
:key_pairs => 200,
|
||||||
:server_groups => 20,
|
:server_groups => 20,
|
||||||
:server_group_members => 20,
|
:server_group_members => 20,
|
||||||
:reservation_expire => 6400,
|
|
||||||
:until_refresh => 30,
|
|
||||||
:max_age => 60
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user