diff --git a/manifests/api.pp b/manifests/api.pp index d6221c43..eb0c1971 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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; diff --git a/releasenotes/notes/deprecate-cache_prefetcher_interval-8a1e5075661f0177.yaml b/releasenotes/notes/deprecate-cache_prefetcher_interval-8a1e5075661f0177.yaml new file mode 100644 index 00000000..167c4f48 --- /dev/null +++ b/releasenotes/notes/deprecate-cache_prefetcher_interval-8a1e5075661f0177.yaml @@ -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. diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index 1040c4f5..7b274aba 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -41,7 +41,6 @@ describe 'glance::api' do :user_storage_quota => '', :image_cache_stall_time => '', :image_cache_max_size => '', - :cache_prefetcher_interval => '', :disk_formats => '', :paste_deploy_flavor => 'keystone', :paste_deploy_config_file => '', @@ -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',