Remove image_cache parameters from nova::compute::libvirt

... because these parameters were deprecated during the Victoria cycle
in favor of the new nova::compute::image_cache class[1].

[1] 3811ac99a8
Change-Id: Icf0a695ccc107c463fdfbedd29fe662f996d76cb
This commit is contained in:
Takashi Kajinami 2021-05-04 21:16:14 +09:00
parent 60ee9f71f3
commit 369f050979
2 changed files with 9 additions and 51 deletions

View File

@ -278,28 +278,6 @@
# which you may need to search key words ``VIR_PERF_PARAM_*``
# Defaults to undef
#
# [*remove_unused_base_images*]
# (optional) Should unused base images be removed?
# If undef is specified, remove the line in nova.conf
# otherwise, use a boolean to remove or not the base images.
# Defaults to undef
#
# [*remove_unused_resized_minimum_age_seconds*]
# (optional) Unused resized base images younger
# than this will not be removed
# If undef is specified, remove the line in nova.conf
# otherwise, use a integer or a string to define after
# how many seconds it will be removed.
# Defaults to undef
#
# [*remove_unused_original_minimum_age_seconds*]
# (optional) Unused unresized base images younger
# than this will not be removed
# If undef is specified, remove the line in nova.conf
# otherwise, use a integer or a string to define after
# how many seconds it will be removed.
# Defaults to undef
#
class nova::compute::libvirt (
$ensure_package = 'present',
$virt_type = 'kvm',
@ -353,40 +331,11 @@ class nova::compute::libvirt (
$libvirt_inject_key = undef,
$libvirt_inject_partition = undef,
$libvirt_enabled_perf_events = undef,
$remove_unused_base_images = undef,
$remove_unused_resized_minimum_age_seconds = undef,
$remove_unused_original_minimum_age_seconds = undef,
) inherits nova::params {
include nova::deps
include nova::params
if $remove_unused_base_images != undef {
warning('The remove_unused_base_images parameter was deprecated and \
will be removed in a future release. Use the nova::compute::image_cache class')
}
if $remove_unused_resized_minimum_age_seconds != undef {
warning('The remove_unused_resized_minimum_age_seconds parameter was deprecated and \
will be removed in a future release. Use the nova::compute::image_cache class')
}
if $remove_unused_original_minimum_age_seconds != undef {
warning('The remove_unused_original_minimum_age_seconds parameter was deprecated and \
will be removed in a future release. Use the nova::compute::image_cache class')
}
# TODO(tkajinam): Remove this when removing deprecated image cache parameters
include nova::compute::image_cache
# Cleanup deprecated image cache parameters
nova_config {
'DEFAULT/remove_unused_base_images': ensure => 'absent';
'DEFAULT/remove_unused_original_minimum_age_seconds': ensure => 'absent';
'libvirt/remove_unused_resized_minimum_age_seconds': ensure => 'absent';
}
if $libvirt_virt_type != undef {
warning('The libvirt_virt_type parameter was deprecated and will be removed \
in a future release. Use the virt_type parameter instead')

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The following parameters have been removed from
the ``nova::compute::libvirt`` class.
- ``remove_unused_base_images``
- ``remove_unused_original_minimum_age_seconds``
- ``remove_unused_resize_minimum_age_seconds``