openstack
/
puppet-swift
Code Issues Proposed changes

Fix swift storage service start on debian 

Some services only start on ubuntu system,
so add debian support for that services

Change-Id: I6e050af98fda5e162278130b4e1116402c3d2ae3
This commit is contained in:
Mehdi Abaakouk 2013-01-28 10:22:40 +01:00 committed by Mehdi Abaakouk
parent adf2b988c4
commit 0dcde3563a
3 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/storage/account.pp
View File

@ -6,19 +6,21 @@ class swift::storage::account(
}
# Not tested in other distros, safety measure
if $operatingsystem == 'Ubuntu' {
service { 'swift-account-reaper':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-account'],
}
case $operatingsystem {
'Ubuntu','Debian': {
service { 'swift-account-reaper':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-account'],
}
service { 'swift-account-auditor':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-account'],
service { 'swift-account-auditor':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-account'],
}
}
}
}

28
manifests/storage/container.pp
View File

@ -6,19 +6,23 @@ class swift::storage::container(
}
# Not tested in other distros, safety measure
case $operatingsystem {
'Ubuntu','Debian': {
service { 'swift-container-updater':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-container'],
}
service { 'swift-container-auditor':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-container'],
}
}
}
if $operatingsystem == 'Ubuntu' {
service { 'swift-container-updater':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-container'],
}
service { 'swift-container-auditor':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-container'],
}
# 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',

26
manifests/storage/object.pp
View File

@ -6,18 +6,20 @@ class swift::storage::object(
}
# Not tested in other distros, safety measure
if $operatingsystem == 'Ubuntu' {
service { 'swift-object-updater':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-object'],
}
service { 'swift-object-auditor':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-object'],
case $operatingsystem {
'Ubuntu','Debian': {
service { 'swift-object-updater':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-object'],
}
service { 'swift-object-auditor':
ensure => running,
enable => true,
provider => $::swift::params::service_provider,
require => Package['swift-object'],
}
}
}
}