Remove metadata_memory_cache_ttl

This parameter was deprecated during the previous cycle[1] and has had
no effect.

[1] 53d7c4ffaa

Change-Id: I421ce1e21cbb661c45835c1d48b63a1e7990ce98
This commit is contained in:
Takashi Kajinami 2024-04-26 16:52:42 +09:00
parent d15151d159
commit 04934dfbbf
2 changed files with 21 additions and 34 deletions

View File

@ -76,42 +76,29 @@
# in the metadata config.
# Defaults to false.
#
# DEPRECATED PRAMETERS
#
# [*metadata_memory_cache_ttl*]
# (optional) Specifies time in seconds a metadata cache entry is valid in
# memory caching backend.
# Defaults to undef
#
class neutron::agents::metadata (
$shared_secret,
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$auth_ca_cert = $facts['os_service_default'],
$nova_client_cert = $facts['os_service_default'],
$nova_client_priv_key = $facts['os_service_default'],
$metadata_host = $facts['os_service_default'],
$metadata_port = $facts['os_service_default'],
$metadata_protocol = $facts['os_service_default'],
$metadata_workers = $facts['os_workers'],
$metadata_backlog = $facts['os_service_default'],
$metadata_insecure = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
Boolean $purge_config = false,
# DEPRECATED PARAMETERS
$metadata_memory_cache_ttl = undef,
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$auth_ca_cert = $facts['os_service_default'],
$nova_client_cert = $facts['os_service_default'],
$nova_client_priv_key = $facts['os_service_default'],
$metadata_host = $facts['os_service_default'],
$metadata_port = $facts['os_service_default'],
$metadata_protocol = $facts['os_service_default'],
$metadata_workers = $facts['os_workers'],
$metadata_backlog = $facts['os_service_default'],
$metadata_insecure = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
Boolean $purge_config = false,
) {
include neutron::deps
include neutron::params
if $metadata_memory_cache_ttl {
warning('The metadata_memory_cache_ttl parameter is deprecated and has no effect.')
}
resources { 'neutron_metadata_agent_config':
purge => $purge_config,
}
@ -132,11 +119,6 @@ class neutron::agents::metadata (
'DEFAULT/rpc_response_max_timeout': value => $rpc_response_max_timeout;
}
# TODO(tkajinam): Remove this after 2024.1 release
neutron_metadata_agent_config {
'DEFAULT/cache_url': ensure => absent;
}
if $::neutron::params::metadata_agent_package {
package { 'neutron-metadata':
ensure => $package_ensure,

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``neutron::agents::metadata::metadata_memory_cache_ttl`` parameter has
been removed.