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:
@@ -76,42 +76,29 @@
|
|||||||
# in the metadata config.
|
# in the metadata config.
|
||||||
# Defaults to false.
|
# 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 (
|
class neutron::agents::metadata (
|
||||||
$shared_secret,
|
$shared_secret,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$debug = $facts['os_service_default'],
|
$debug = $facts['os_service_default'],
|
||||||
$auth_ca_cert = $facts['os_service_default'],
|
$auth_ca_cert = $facts['os_service_default'],
|
||||||
$nova_client_cert = $facts['os_service_default'],
|
$nova_client_cert = $facts['os_service_default'],
|
||||||
$nova_client_priv_key = $facts['os_service_default'],
|
$nova_client_priv_key = $facts['os_service_default'],
|
||||||
$metadata_host = $facts['os_service_default'],
|
$metadata_host = $facts['os_service_default'],
|
||||||
$metadata_port = $facts['os_service_default'],
|
$metadata_port = $facts['os_service_default'],
|
||||||
$metadata_protocol = $facts['os_service_default'],
|
$metadata_protocol = $facts['os_service_default'],
|
||||||
$metadata_workers = $facts['os_workers'],
|
$metadata_workers = $facts['os_workers'],
|
||||||
$metadata_backlog = $facts['os_service_default'],
|
$metadata_backlog = $facts['os_service_default'],
|
||||||
$metadata_insecure = $facts['os_service_default'],
|
$metadata_insecure = $facts['os_service_default'],
|
||||||
$report_interval = $facts['os_service_default'],
|
$report_interval = $facts['os_service_default'],
|
||||||
$rpc_response_max_timeout = $facts['os_service_default'],
|
$rpc_response_max_timeout = $facts['os_service_default'],
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$metadata_memory_cache_ttl = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include neutron::deps
|
include neutron::deps
|
||||||
include neutron::params
|
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':
|
resources { 'neutron_metadata_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
}
|
}
|
||||||
@@ -132,11 +119,6 @@ class neutron::agents::metadata (
|
|||||||
'DEFAULT/rpc_response_max_timeout': value => $rpc_response_max_timeout;
|
'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 {
|
if $::neutron::params::metadata_agent_package {
|
||||||
package { 'neutron-metadata':
|
package { 'neutron-metadata':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``neutron::agents::metadata::metadata_memory_cache_ttl`` parameter has
|
||||||
|
been removed.
|
Reference in New Issue
Block a user