openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Add missing Swift object reconstructor service"

This commit is contained in:
Jenkins 2017-07-10 20:00:29 +00:00 committed by Gerrit Code Review
parent 64ed45651a af6fb24845
commit 68854cdcfa
5 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -16,6 +16,7 @@ class swift::params {
$object_package_name = 'swift-object'
$object_server_service_name = 'swift-object'
$object_auditor_service_name = 'swift-object-auditor'
$object_reconstructor_service_name = 'swift-object-reconstructor'
$object_replicator_service_name = 'swift-object-replicator'
$object_updater_service_name = 'swift-object-updater'
$object_expirer_package_name = 'swift-object-expirer'
@ -41,6 +42,7 @@ class swift::params {
$object_package_name = 'openstack-swift-object'
$object_server_service_name = 'openstack-swift-object'
$object_auditor_service_name = 'openstack-swift-object-auditor'
$object_reconstructor_service_name = 'openstack-swift-object-reconstructor'
$object_replicator_service_name = 'openstack-swift-object-replicator'
$object_updater_service_name = 'openstack-swift-object-updater'
$object_expirer_package_name = 'openstack-swift-proxy'
@ -67,6 +69,7 @@ class swift::params {
'swift-proxy-server',
'swift-object-auditor',
'swift-object-expirer',
'swift-object-reconstructor',
'swift-object-replicator',
'swift-object-server',
'swift-object-updater',

12
manifests/storage/object.pp
View File

@ -36,6 +36,7 @@ class swift::storage::object(
include ::swift::deps
Swift_config<| |> ~> Service['swift-object-updater']
Swift_config<| |> ~> Service['swift-object-reconstructor']
swift::storage::generic { 'object':
manage_service => $manage_service,
@ -62,4 +63,15 @@ class swift::storage::object(
require => Package['swift-object'],
service_subscribe => Concat["/etc/swift/${config_file_name}"],
}
swift::service { 'swift-object-reconstructor':
os_family_service_name => $::swift::params::object_reconstructor_service_name,
service_ensure => $service_ensure,
enabled => $enabled,
config_file_name => $config_file_name,
service_provider => $service_provider,
require => Package['swift-object'],
service_subscribe => Concat["/etc/swift/${config_file_name}"],
}
}

4
releasenotes/notes/swift-add-reconstructor-service-25dd7df5a7d25612.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Added the object-reconstructor service and enabled it by default.
This is required for erasure coding.

36
spec/classes/swift_storage_object_spec.rb
View File

@ -78,10 +78,11 @@ describe 'swift::storage::object' do
let :platform_params do
{ :service_names => {
'swift-object-server' => 'swift-object',
'swift-object-replicator' => 'swift-object-replicator',
'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor'
'swift-object-server' => 'swift-object',
'swift-object-reconstructor' => 'swift-object-reconstructor',
'swift-object-replicator' => 'swift-object-replicator',
'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor'
},
:service_provider => nil
}
@ -96,10 +97,11 @@ describe 'swift::storage::object' do
let :platform_params do
{ :service_names => {
'swift-object-server' => 'swift-object-server',
'swift-object-replicator' => 'swift-object-replicator',
'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor',
'swift-object-server' => 'swift-object-server',
'swift-object-reconstructor' => 'swift-object-reconstructor',
'swift-object-replicator' => 'swift-object-replicator',
'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor',
},
:service_provider => 'swiftinit'
}
@ -121,10 +123,11 @@ describe 'swift::storage::object' do
let :platform_params do
{ :service_names => {
'swift-object-server' => 'openstack-swift-object',
'swift-object-replicator' => 'openstack-swift-object-replicator',
'swift-object-updater' => 'openstack-swift-object-updater',
'swift-object-auditor' => 'openstack-swift-object-auditor'
'swift-object-server' => 'openstack-swift-object',
'swift-object-reconstructor' => 'openstack-swift-object-reconstructor',
'swift-object-replicator' => 'openstack-swift-object-replicator',
'swift-object-updater' => 'openstack-swift-object-updater',
'swift-object-auditor' => 'openstack-swift-object-auditor'
}
}
end
@ -138,10 +141,11 @@ describe 'swift::storage::object' do
let :platform_params do
{ :service_names => {
'swift-object-server' => 'swift-object-server',
'swift-object-replicator' => 'swift-object-replicator',
'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor',
'swift-object-server' => 'swift-object-server',
'swift-object-reconstructor' => 'swift-object-reconstructor',
'swift-object-replicator' => 'swift-object-replicator',
'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor',
},
:service_provider => 'swiftinit'
}

2
templates/object-server.conf.erb
View File

@ -42,3 +42,5 @@ concurrency = <%= @replicator_concurrency %>
concurrency = <%= @updater_concurrency %>
[object-auditor]
[object-reconstructor]