openstack/puppet-swift
Code Issues Proposed changes

Prevent some race conditions by requiring the storage server package

Browse Source
This commit is contained in:
Sergio Rubio 2012-09-24 15:22:16 +02:00
parent 403a88a05f
commit 5d68f7e260
3 changed files with 8 additions and 1 deletions

2
manifests/storage/account.pp

@ -11,12 +11,14 @@ class swift::storage::account(
ensure => running, ensure => running,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-account'],
} }
service { 'swift-account-auditor': service { 'swift-account-auditor':
ensure => running, ensure => running,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-account'],
} }
} }
} }

5
manifests/storage/container.pp

@ -11,15 +11,18 @@ class swift::storage::container(
ensure => running, ensure => running,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-container'],
} }
service { 'swift-container-auditor': service { 'swift-container-auditor':
ensure => running, ensure => running,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-container'],
} }
# The following service conf is missing in Ubunty 12.04 # The following service conf is missing in Ubunty 12.04
file { '/etc/init/swift-container-sync.conf': file { '/etc/init/swift-container-sync.conf':
source => 'puppet:///modules/swift/swift-container-sync.conf.upstart', source => 'puppet:///modules/swift/swift-container-sync.conf.upstart',
require => Package['swift-container'],
} }
service { 'swift-container-sync': service { 'swift-container-sync':
ensure => running, ensure => running,

2
manifests/storage/object.pp

@ -11,11 +11,13 @@ class swift::storage::object(
ensure => running, ensure => running,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-object'],
} }
service { 'swift-object-auditor': service { 'swift-object-auditor':
ensure => running, ensure => running,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-object'],
} }
} }
} }