From 90a97dbbbcae19357d60b83a95054ba3b441adac Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 26 Oct 2024 18:23:15 +0900 Subject: [PATCH] objectexpirer: Fix lack of validation of service_provider We introduced the validation of service_provider but didn't update the one in object-expirer manifest. Change-Id: I921eb2b12a9ca469fb23e8dedde234e78e1854f8 --- manifests/objectexpirer.pp | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index db3dd656..c13de034 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -111,28 +111,28 @@ # Defaults to false. # class swift::objectexpirer( - Boolean $manage_service = true, - Boolean $enabled = true, - $package_ensure = 'present', - Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], - $concurrency = $facts['os_service_default'], - $expiring_objects_account_name = $facts['os_service_default'], - $interval = $facts['os_service_default'], - $process = $facts['os_service_default'], - $processes = $facts['os_service_default'], - $reclaim_age = $facts['os_service_default'], - $recon_cache_path = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $service_provider = $::swift::params::service_provider, - $memcache_servers = ['127.0.0.1:11211'], - $cache_tls_enabled = $facts['os_service_default'], - $cache_tls_cafile = $facts['os_service_default'], - $cache_tls_certfile = $facts['os_service_default'], - $cache_tls_keyfile = $facts['os_service_default'], - $log_name = $facts['os_service_default'], - $log_level = 'INFO', - $log_facility = 'LOG_LOCAL2', - Boolean $purge_config = false, + Boolean $manage_service = true, + Boolean $enabled = true, + $package_ensure = 'present', + Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], + $concurrency = $facts['os_service_default'], + $expiring_objects_account_name = $facts['os_service_default'], + $interval = $facts['os_service_default'], + $process = $facts['os_service_default'], + $processes = $facts['os_service_default'], + $reclaim_age = $facts['os_service_default'], + $recon_cache_path = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + Swift::ServiceProvider $service_provider = $::swift::params::service_provider, + $memcache_servers = ['127.0.0.1:11211'], + $cache_tls_enabled = $facts['os_service_default'], + $cache_tls_cafile = $facts['os_service_default'], + $cache_tls_certfile = $facts['os_service_default'], + $cache_tls_keyfile = $facts['os_service_default'], + $log_name = $facts['os_service_default'], + $log_level = 'INFO', + $log_facility = 'LOG_LOCAL2', + Boolean $purge_config = false, ) inherits swift::params { include swift::deps