openstack/puppet-swift
Code Issues Proposed changes

Reduce hard-coded defaults of object-expirer.conf

Browse Source 
... to reduce the require effort to maintain consistent defaults.

Change-Id: I10dc25de4d418e18f22166dc5a56e64eed36825a
This commit is contained in:
Takashi Kajinami
2022-08-22 21:32:20 +09:00
parent 7d1956eadc
commit 428d620c7f
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/objectexpirer.pp
View File

@@ -19,42 +19,42 @@
# #
# [*auto_create_account_prefix*] # [*auto_create_account_prefix*]
# (optional) Prefix to use when automatically creating accounts. # (optional) Prefix to use when automatically creating accounts.
# Defaults to '.'. # Defaults to $::os_service_default.
# #
# [*concurrency*] # [*concurrency*]
# (optional) Number of replication workers to spawn. # (optional) Number of replication workers to spawn.
# Defaults to 1. # Defaults to $::os_service_default.
# #
# [*expiring_objects_account_name*] # [*expiring_objects_account_name*]
# (optional) Account name used for expiring objects. # (optional) Account name used for expiring objects.
# Defaults to 'expiring_objects'. # Defaults to $::os_service_default.
# #
# [*interval*] # [*interval*]
# (optional) Minimum time for a pass to take, in seconds. # (optional) Minimum time for a pass to take, in seconds.
# Defaults to 300. # Defaults to $::os_service_default.
# #
# [*process*] # [*process*]
# (optional) Which part of the work defined by $processes # (optional) Which part of the work defined by $processes
# will this instance take. # will this instance take.
# Defaults to 0. # Defaults to $::os_service_default.
# #
# [*processes*] # [*processes*]
# (optional) How many parts to divide the work into, one part per # (optional) How many parts to divide the work into, one part per
# process. 0 means a single process will do all work. # process. 0 means a single process will do all work.
# Defaults to 0. # Defaults to $::os_service_default.
# #
# [*reclaim_age*] # [*reclaim_age*]
# (optional) Time elapsed in seconds before an object can be # (optional) Time elapsed in seconds before an object can be
# reclaimed. # reclaimed.
# Defaults to 604800 (1 week). # Defaults to $::os_service_default.
# #
# [*recon_cache_path*] # [*recon_cache_path*]
# (optional) Directory where stats for a few items will be stored. # (optional) Directory where stats for a few items will be stored.
# Defaults to '/var/cache/swift'. # Defaults to $::os_service_default.
# #
# [*report_interval*] # [*report_interval*]
# (optional) Report interval, in seconds. # (optional) Report interval, in seconds.
# Defaults to 300. # Defaults to $::os_service_default.
# #
# [*service_provider*] # [*service_provider*]
# (optional) # (optional)
@@ -110,15 +110,15 @@ class swift::objectexpirer(
$enabled = true, $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
$auto_create_account_prefix = '.', $auto_create_account_prefix = $::os_service_default,
$concurrency = 1, $concurrency = $::os_service_default,
$expiring_objects_account_name = 'expiring_objects', $expiring_objects_account_name = $::os_service_default,
$interval = 300, $interval = $::os_service_default,
$process = 0, $process = $::os_service_default,
$processes = 0, $processes = $::os_service_default,
$reclaim_age = 604800, $reclaim_age = $::os_service_default,
$recon_cache_path = '/var/cache/swift', $recon_cache_path = $::os_service_default,
$report_interval = 300, $report_interval = $::os_service_default,
$service_provider = $::swift::params::service_provider, $service_provider = $::swift::params::service_provider,
$memcache_servers = ['127.0.0.1:11211'], $memcache_servers = ['127.0.0.1:11211'],
$cache_tls_enabled = false, $cache_tls_enabled = false,

18
spec/classes/swift_objectexpirer_spec.rb
View File

@@ -7,15 +7,15 @@ describe 'swift::objectexpirer' do
:enabled => true, :enabled => true,
:package_ensure => 'present', :package_ensure => 'present',
:pipeline => ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], :pipeline => ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
:auto_create_account_prefix => '.', :auto_create_account_prefix => '<SERVICE DEFAULT>',
:concurrency => 1, :concurrency => '<SERVICE DEFAULT>',
:expiring_objects_account_name => 'expiring_objects', :expiring_objects_account_name => '<SERVICE DEFAULT>',
:interval => 300, :interval => '<SERVICE DEFAULT>',
:process => 0, :process => '<SERVICE DEFAULT>',
:processes => 0, :processes => '<SERVICE DEFAULT>',
:reclaim_age => 604800, :reclaim_age => '<SERVICE DEFAULT>',
:recon_cache_path => '/var/cache/swift', :recon_cache_path => '<SERVICE DEFAULT>',
:report_interval => 300, :report_interval => '<SERVICE DEFAULT>',
:log_facility => 'LOG_LOCAL2', :log_facility => 'LOG_LOCAL2',
:log_level => 'INFO', :log_level => 'INFO',
:memcache_servers => ['127.0.0.1:11211'], :memcache_servers => ['127.0.0.1:11211'],