From e768302b78dea6c65aca7a262c0d9349e5e8192d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 20 Feb 2024 11:39:06 +0900
Subject: [PATCH] Support object-relinker

This introduces the config entries for object-relinker, which is a CLI
tool used to increase part power.

Change-Id: Ied52845c6b3b30a6aa6744c6a9c599bbd81b6e9e
---
 manifests/storage/server.pp                              | 4 ++++
 releasenotes/notes/object-relinker-cafa2c2f45a66b50.yaml | 5 +++++
 spec/defines/swift_storage_server_spec.rb                | 3 +++
 3 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/object-relinker-cafa2c2f45a66b50.yaml

diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index af472c37..06d4db4d 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -592,6 +592,8 @@ define swift::storage::server(
         'object-updater/node_timeout'     => {'value'  => $updater_node_timeout},
         # object-reconstructor
         'object-reconstructor/'           => {'ensure' => present},
+        # object-relinker
+        'object-relinker/'                => {'ensure' => present},
       }
 
       if $log_name_per_daemon {
@@ -600,6 +602,7 @@ define swift::storage::server(
           'object-replicator/log_name'    => {'value' => 'object-replicator'},
           'object-updater/log_name'       => {'value' => 'object-updater'},
           'object-reconstructor/log_name' => {'value' => 'object-reconstructor'},
+          'object-relinker/log_name'      => {'value' => 'object-relinker'},
         }
       } else {
         $log_name_opts = {
@@ -607,6 +610,7 @@ define swift::storage::server(
           'object-replicator/log_name'    => {'ensure' => absent},
           'object-updater/log_name'       => {'ensure' => absent},
           'object-reconstructor/log_name' => {'ensure' => absent},
+          'object-relinker/log_name'      => {'ensure' => absent},
         }
       }
     }
diff --git a/releasenotes/notes/object-relinker-cafa2c2f45a66b50.yaml b/releasenotes/notes/object-relinker-cafa2c2f45a66b50.yaml
new file mode 100644
index 00000000..32a120e1
--- /dev/null
+++ b/releasenotes/notes/object-relinker-cafa2c2f45a66b50.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Now ``object-server.conf`` file contains the ``[object-relinker]`` section,
+    which is used by the swift-object-relinker CLI tool.
diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb
index dfdf76bc..7a3c0e3b 100644
--- a/spec/defines/swift_storage_server_spec.rb
+++ b/spec/defines/swift_storage_server_spec.rb
@@ -476,6 +476,8 @@ describe 'swift::storage::server' do
         is_expected.to contain_swift_object_config('object-updater/node_timeout').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_swift_object_config('object-reconstructor/').with_ensure('present')
         is_expected.to contain_swift_object_config('object-reconstructor/log_name').with_ensure('absent')
+        is_expected.to contain_swift_object_config('object-relinker/').with_ensure('present')
+        is_expected.to contain_swift_object_config('object-relinker/log_name').with_ensure('absent')
       }
 
       context 'with customized pipeline' do
@@ -566,6 +568,7 @@ describe 'swift::storage::server' do
           is_expected.to contain_swift_object_config('object-replicator/log_name').with_value('object-replicator')
           is_expected.to contain_swift_object_config('object-updater/log_name').with_value('object-updater')
           is_expected.to contain_swift_object_config('object-reconstructor/log_name').with_value('object-reconstructor')
+          is_expected.to contain_swift_object_config('object-relinker/log_name').with_value('object-relinker')
         end
       end
     end