From 428d620c7f43d59bdedea2060ec4f4430919c5ef Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 22 Aug 2022 21:32:20 +0900
Subject: [PATCH] Reduce hard-coded defaults of object-expirer.conf

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

Change-Id: I10dc25de4d418e18f22166dc5a56e64eed36825a
---
 manifests/objectexpirer.pp               | 36 ++++++++++++------------
 spec/classes/swift_objectexpirer_spec.rb | 18 ++++++------
 2 files changed, 27 insertions(+), 27 deletions(-)

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