openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Deprecate support for [DEFAULT] cache_prefetcher_interval"

This commit is contained in:
Zuul 2022-09-08 14:32:26 +00:00 committed by Gerrit Code Review
parent 1def180655 89857141d1
commit 0176638d47
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/api.pp
View File

@ -66,10 +66,6 @@
# (optional) List of allowed values for an image disk_format attribute.
# Defaults to $::os_service_default.
#
# [*cache_prefetcher_interval*]
# (optional) The interval in seconds to run periodic job 'cache_images'
# Defaults to $::os_service_default.
#
# [*image_cache_max_size*]
# (optional) The upper limit (the maximum size of accumulated cache in bytes) beyond which pruner,
# if running, starts cleaning the images cache.
@ -299,6 +295,10 @@
# service name removed.
# Defaults to undef
#
# [*cache_prefetcher_interval*]
# (optional) The interval in seconds to run periodic job 'cache_images'
# Defaults to undef.
#
class glance::api(
$package_ensure = 'present',
$bind_host = $::os_service_default,
@ -321,7 +321,6 @@ class glance::api(
$default_backend = undef,
$container_formats = $::os_service_default,
$disk_formats = $::os_service_default,
$cache_prefetcher_interval = $::os_service_default,
$image_cache_max_size = $::os_service_default,
$image_cache_stall_time = $::os_service_default,
$image_cache_dir = '/var/lib/glance/image-cache',
@ -365,6 +364,7 @@ class glance::api(
$filesystem_store_metadata_file = undef,
$filesystem_store_file_perm = undef,
$pipeline = undef,
$cache_prefetcher_interval = undef,
) inherits glance {
include glance::deps
@ -398,6 +398,13 @@ class glance::api(
}
}
if $cache_prefetcher_interval {
warning('The cache_prefetcher_interval parameter has been deprecate and has no effect.')
}
glance_api_config {
'DEFAULT/cache_prefetcher_interval': ensure => absent;
}
if $sync_db {
include glance::db::sync
include glance::db::metadefs
@ -429,7 +436,6 @@ class glance::api(
'DEFAULT/delayed_delete': value => $delayed_delete;
'DEFAULT/enforce_secure_rbac': value => $enforce_secure_rbac;
'DEFAULT/use_keystone_limits': value => $use_keystone_limits;
'DEFAULT/cache_prefetcher_interval': value => $cache_prefetcher_interval;
'DEFAULT/image_cache_dir': value => $image_cache_dir;
'DEFAULT/image_cache_stall_time': value => $image_cache_stall_time;
'DEFAULT/image_cache_max_size': value => $image_cache_max_size;

6
releasenotes/notes/deprecate-cache_prefetcher_interval-8a1e5075661f0177.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The ``glance::api::cache_prefetcher_interval`` parameter has been
deprecaed and has no effect now. It will be removed completely in a future
release.

3
spec/classes/glance_api_spec.rb
View File

@ -41,7 +41,6 @@ describe 'glance::api' do
:user_storage_quota => '<SERVICE DEFAULT>',
:image_cache_stall_time => '<SERVICE DEFAULT>',
:image_cache_max_size => '<SERVICE DEFAULT>',
:cache_prefetcher_interval => '<SERVICE DEFAULT>',
:disk_formats => '<SERVICE DEFAULT>',
:paste_deploy_flavor => 'keystone',
:paste_deploy_config_file => '<SERVICE DEFAULT>',
@ -91,7 +90,6 @@ describe 'glance::api' do
:user_storage_quota => 0,
:image_cache_stall_time => '10',
:image_cache_max_size => '10737418240',
:cache_prefetcher_interval => '300',
:paste_deploy_flavor => 'keystone+caching',
:paste_deploy_config_file => 'glance-api-paste.ini',
:sync_db => false,
@ -146,7 +144,6 @@ describe 'glance::api' do
'image_cache_dir',
'image_cache_stall_time',
'image_cache_max_size',
'cache_prefetcher_interval',
'node_staging_uri',
'worker_self_reference_url',
'image_member_quota',