diff --git a/site-modules/profile/manifests/swh/deploy/objstorage.pp b/site-modules/profile/manifests/swh/deploy/objstorage.pp index ce77230b..f06e17e2 100644 --- a/site-modules/profile/manifests/swh/deploy/objstorage.pp +++ b/site-modules/profile/manifests/swh/deploy/objstorage.pp @@ -1,39 +1,38 @@ # Deployment of the swh.objstorage.api server class profile::swh::deploy::objstorage { $conf_directory = lookup('swh::deploy::objstorage::conf_directory') $user = lookup('swh::deploy::objstorage::user') $group = lookup('swh::deploy::objstorage::group') $swh_packages = ['python3-swh.objstorage'] package {$swh_packages: ensure => present, require => Apt::Source['softwareheritage'], } Package[$swh_packages] ~> Service['gunicorn-swh-objstorage'] file {$conf_directory: ensure => directory, owner => 'root', group => $group, mode => '0750', } ::profile::swh::deploy::rpc_server {'objstorage': executable => 'swh.objstorage.api.server:make_app_from_configfile()', - worker => 'async', } # special configuration for pathslicing $objstorage_cfg = lookup('swh::deploy::objstorage::config', Hash)['objstorage'] if $objstorage_cfg['cls'] == 'pathslicing' { $obj_directory = $objstorage_cfg['args']['root'] file {$obj_directory: ensure => directory, owner => $user, group => $group, mode => '0750', } } } diff --git a/site-modules/profile/manifests/swh/deploy/vault.pp b/site-modules/profile/manifests/swh/deploy/vault.pp index 4e8f0a1f..5abab2b6 100644 --- a/site-modules/profile/manifests/swh/deploy/vault.pp +++ b/site-modules/profile/manifests/swh/deploy/vault.pp @@ -1,29 +1,28 @@ # Deployment of the swh.vault.api server class profile::swh::deploy::vault { include ::profile::swh::deploy::base_vault Package['python3-swh.vault'] ~> Service['gunicorn-swh-vault'] $user = lookup('swh::deploy::vault::user') $cache_directory = lookup('swh::deploy::vault::cache') file {$cache_directory: ensure => directory, owner => $user, group => 'swhdev', mode => '0755', } ::profile::swh::deploy::rpc_server {'vault': executable => 'swh.vault.api.server:make_app_from_configfile()', - worker => 'async', } # Install vault end-to-end checks @@profile::icinga2::objects::e2e_checks_vault {"End-to-end Vault Test(s) in ${environment}": server_vault => lookup('swh::deploy::vault::e2e::storage'), server_webapp => lookup('swh::deploy::vault::e2e::webapp'), environment => $environment, } }