diff --git a/manifests/proxy.pp b/manifests/proxy.pp index 503a8d54..f5f10a04 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -135,6 +135,8 @@ class swift::proxy( include ::swift::params include ::concat::setup + Swift_config<| |> ~> Service['swift-proxy'] + validate_bool($account_autocreate) validate_bool($allow_account_management) validate_array($pipeline) diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp index 3a66d678..72f130ca 100644 --- a/manifests/storage/account.pp +++ b/manifests/storage/account.pp @@ -18,6 +18,10 @@ class swift::storage::account( $enabled = true, $package_ensure = 'present' ) { + + Swift_config<| |> ~> Service['swift-account-reaper'] + Swift_config<| |> ~> Service['swift-account-auditor'] + swift::storage::generic { 'account': manage_service => $manage_service, enabled => $enabled, diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp index f11bc03b..aa054f52 100644 --- a/manifests/storage/container.pp +++ b/manifests/storage/container.pp @@ -23,6 +23,10 @@ class swift::storage::container( $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, @@ -71,5 +75,6 @@ class swift::storage::container( 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'] } } diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp index 928d52e9..a6fc9bcf 100644 --- a/manifests/storage/generic.pp +++ b/manifests/storage/generic.pp @@ -38,6 +38,7 @@ define swift::storage::generic( include ::swift::params Class['swift::storage'] -> Swift::Storage::Generic[$name] + Swift_config<| |> ~> Service["swift-${name}"] validate_re($name, '^object|container|account$') diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp index 2055843d..243e0d97 100644 --- a/manifests/storage/object.pp +++ b/manifests/storage/object.pp @@ -18,6 +18,10 @@ class swift::storage::object( $enabled = true, $package_ensure = 'present' ) { + + Swift_config<| |> ~> Service['swift-object-updater'] + Swift_config<| |> ~> Service['swift-object-auditor'] + swift::storage::generic { 'object': manage_service => $manage_service, enabled => $enabled,