Merge "Support object-relinker"
This commit is contained in:
commit
5e07964327
|
@ -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},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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.
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue