6dc85b0f79
swift.conf contains the hash_suffix. With the current module, we have a race condition where services can start *before* having the right hash in swift.conf, so some objects mays be put in quarantine. When usint swift_config (which affect swift.conf), we should restart all services to ensure our ring is running correctly. Change-Id: I1087ba4ec079ca9c43bea9ff0511347632871ec2 Closes-bug: #1442329
81 lines
2.3 KiB
Puppet
81 lines
2.3 KiB
Puppet
#
|
|
# === Parameters
|
|
#
|
|
# [*enabled*]
|
|
# (optional) Should the service be enabled.
|
|
# Defaults to true
|
|
#
|
|
# [*manage_service*]
|
|
# (optional) Whether the service should be managed by Puppet.
|
|
# Defaults to true.
|
|
#
|
|
# [*package_ensure*]
|
|
# (optional) Value of package resource parameter 'ensure'.
|
|
# Defaults to 'present'.
|
|
#
|
|
# [*allowed_sync_hosts*]
|
|
# (optional) A list of hosts allowed in the X-Container-Sync-To
|
|
# field for containers. Defaults to one entry list '127.0.0.1'.
|
|
#
|
|
class swift::storage::container(
|
|
$manage_service = true,
|
|
$enabled = true,
|
|
$package_ensure = 'present',
|
|
$allowed_sync_hosts = ['127.0.0.1'],
|
|
) {
|
|
|
|
Swift_config<| |> ~> Service['swift-container-updater']
|
|
Swift_config<| |> ~> Service['swift-container-auditor']
|
|
|
|
swift::storage::generic { 'container':
|
|
manage_service => $manage_service,
|
|
enabled => $enabled,
|
|
package_ensure => $package_ensure,
|
|
}
|
|
|
|
include ::swift::params
|
|
|
|
if $manage_service {
|
|
if $enabled {
|
|
$service_ensure = 'running'
|
|
} else {
|
|
$service_ensure = 'stopped'
|
|
}
|
|
}
|
|
|
|
service { 'swift-container-updater':
|
|
ensure => $service_ensure,
|
|
name => $::swift::params::container_updater_service_name,
|
|
enable => $enabled,
|
|
provider => $::swift::params::service_provider,
|
|
require => Package['swift-container'],
|
|
}
|
|
|
|
service { 'swift-container-auditor':
|
|
ensure => $service_ensure,
|
|
name => $::swift::params::container_auditor_service_name,
|
|
enable => $enabled,
|
|
provider => $::swift::params::service_provider,
|
|
require => Package['swift-container'],
|
|
}
|
|
|
|
if $::operatingsystem == 'Ubuntu' {
|
|
# The following service conf is missing in Ubunty 12.04
|
|
file { '/etc/init/swift-container-sync.conf':
|
|
source => 'puppet:///modules/swift/swift-container-sync.conf.upstart',
|
|
require => Package['swift-container'],
|
|
}
|
|
file { '/etc/init.d/swift-container-sync':
|
|
ensure => link,
|
|
target => '/lib/init/upstart-job',
|
|
}
|
|
service { 'swift-container-sync':
|
|
ensure => $service_ensure,
|
|
enable => $enabled,
|
|
provider => $::swift::params::service_provider,
|
|
require => File['/etc/init/swift-container-sync.conf', '/etc/init.d/swift-container-sync'],
|
|
}
|
|
Swift_config<| |> ~> Service['swift-container-sync']
|
|
}
|
|
}
|