Merge "objectexpirer: Fix lack of validation of service_provider"

This commit is contained in:
Zuul
2024-10-28 15:31:08 +00:00
committed by Gerrit Code Review

View File

@@ -111,28 +111,28 @@
# Defaults to false. # Defaults to false.
# #
class swift::objectexpirer( class swift::objectexpirer(
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
$concurrency = $facts['os_service_default'], $concurrency = $facts['os_service_default'],
$expiring_objects_account_name = $facts['os_service_default'], $expiring_objects_account_name = $facts['os_service_default'],
$interval = $facts['os_service_default'], $interval = $facts['os_service_default'],
$process = $facts['os_service_default'], $process = $facts['os_service_default'],
$processes = $facts['os_service_default'], $processes = $facts['os_service_default'],
$reclaim_age = $facts['os_service_default'], $reclaim_age = $facts['os_service_default'],
$recon_cache_path = $facts['os_service_default'], $recon_cache_path = $facts['os_service_default'],
$report_interval = $facts['os_service_default'], $report_interval = $facts['os_service_default'],
$service_provider = $::swift::params::service_provider, Swift::ServiceProvider $service_provider = $::swift::params::service_provider,
$memcache_servers = ['127.0.0.1:11211'], $memcache_servers = ['127.0.0.1:11211'],
$cache_tls_enabled = $facts['os_service_default'], $cache_tls_enabled = $facts['os_service_default'],
$cache_tls_cafile = $facts['os_service_default'], $cache_tls_cafile = $facts['os_service_default'],
$cache_tls_certfile = $facts['os_service_default'], $cache_tls_certfile = $facts['os_service_default'],
$cache_tls_keyfile = $facts['os_service_default'], $cache_tls_keyfile = $facts['os_service_default'],
$log_name = $facts['os_service_default'], $log_name = $facts['os_service_default'],
$log_level = 'INFO', $log_level = 'INFO',
$log_facility = 'LOG_LOCAL2', $log_facility = 'LOG_LOCAL2',
Boolean $purge_config = false, Boolean $purge_config = false,
) inherits swift::params { ) inherits swift::params {
include swift::deps include swift::deps