diff --git a/manifests/swh/deploy/objstorage.pp b/manifests/swh/deploy/objstorage.pp index 72de0dc..7b809d5 100644 --- a/manifests/swh/deploy/objstorage.pp +++ b/manifests/swh/deploy/objstorage.pp @@ -1,77 +1,77 @@ -# Deployment of the swh.storage.objstorage.api server +# Deployment of the swh.objstorage.api server class profile::swh::deploy::objstorage { $conf_directory = hiera('swh::deploy::objstorage::conf_directory') $conf_file = hiera('swh::deploy::objstorage::conf_file') $user = hiera('swh::deploy::objstorage::user') $group = hiera('swh::deploy::objstorage::group') $directory = hiera('swh::deploy::objstorage::directory') - $depth = hiera('swh::deploy::objstorage::depth') + $depth = hiera('swh::deploy::objstorage::slicing') - $swh_packages = ['python3-swh.storage'] + $swh_packages = ['python3-swh.objstorage'] $uwsgi_listen_address = hiera('swh::deploy::objstorage::uwsgi::listen') $uwsgi_workers = hiera('swh::deploy::objstorage::uwsgi::workers') $uwsgi_http_workers = hiera('swh::deploy::objstorage::uwsgi::http_workers') $uwsgi_http_keepalive = hiera('swh::deploy::objstorage::uwsgi::http_keepalive') $uwsgi_http_timeout = hiera('swh::deploy::objstorage::uwsgi::http_timeout') $uwsgi_max_requests = hiera('swh::deploy::objstorage::uwsgi::max_requests') $uwsgi_max_requests_delta = hiera('swh::deploy::objstorage::uwsgi::max_requests_delta') $uwsgi_reload_mercy = hiera('swh::deploy::objstorage::uwsgi::reload_mercy') include ::uwsgi package {$swh_packages: ensure => latest, require => Apt::Source['softwareheritage'], notify => Service['uwsgi'], } file {$conf_directory: ensure => directory, owner => 'root', group => $group, mode => '0750', } file {$conf_file: ensure => present, owner => 'root', group => $group, mode => '0640', content => template('profile/swh/deploy/storage/objstorage.ini.erb'), notify => Service['uwsgi'], } ::uwsgi::site {'swh-objstorage': ensure => enabled, settings => { plugin => 'python3', workers => $uwsgi_workers, max_requests => $uwsgi_max_requests, max_requests_delta => $uwsgi_max_requests_delta, worker_reload_mercy => $uwsgi_reload_mercy, reload_mercy => $uwsgi_reload_mercy, uid => $user, gid => $user, umask => '022', - module => 'swh.storage.objstorage.api.server', + module => 'swh.objstorage.api.server', callable => 'run_from_webserver', } } ::uwsgi::site {'swh-objstorage-http': ensure => enabled, settings => { workers => 0, http => $uwsgi_listen_address, http_workers => $uwsgi_http_workers, http_keepalive => $uwsgi_http_keepalive, http_timeout => $uwsgi_http_timeout, http_to => '/var/run/uwsgi/app/swh-objstorage/socket', uid => $user, gid => $user, } } } diff --git a/templates/swh/deploy/storage/objstorage.ini.erb b/templates/swh/deploy/storage/objstorage.ini.erb index a2024f2..035ff69 100644 --- a/templates/swh/deploy/storage/objstorage.ini.erb +++ b/templates/swh/deploy/storage/objstorage.ini.erb @@ -1,6 +1,6 @@ -# swh.storage.objstorage.api configuration file +# swh.objstorage.api configuration file # File managed by puppet - modifications will be overwritten [main] -storage_depth = <%= @depth %> storage_base = <%= @directory %> +storage_slicing = <%= @slicing %>