diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1669,7 +1669,7 @@ media_root: "%{hiera('swh::deploy::deposit::media_root_directory')}" swh::deploy::worker::loader_deposit::config_file: "%{hiera('swh::conf_directory')}/loader_deposit.yml" -swh::deploy::worker::loader_deposit::concurrency: 2 +swh::deploy::worker::loader_deposit::concurrency: 1 swh::deploy::worker::loader_deposit::private_tmp: true swh::deploy::worker::loader_deposit::loglevel: info # deposit_basic_auth_swhworker_{username|password} in private_data @@ -1682,10 +1682,25 @@ - swh.deposit.loader.tasks task_queues: - swh.deposit.loader.tasks.LoadDepositArchiveTsk + url: https://deposit.softwareheritage.org + auth: + username: "%{hiera('deposit_basic_auth_swhworker_username')}" + password: "%{hiera('deposit_basic_auth_swhworker_password')}" + +swh::deploy::worker::checker_deposit::config_file: "%{hiera('swh::conf_directory')}/checker_deposit.yml" +swh::deploy::worker::checker_deposit::concurrency: 1 +swh::deploy::worker::checker_deposit::private_tmp: true +swh::deploy::worker::checker_deposit::loglevel: info +# deposit_basic_auth_swhworker_{username|password} in private_data +swh::deploy::worker::checker_deposit::config: + storage: "%{alias('swh::remote_service::storage::config::writable')}" + extraction_dir: /tmp/swh.checker.deposit/ + celery: + task_broker: "%{alias('swh::deploy::worker::task_broker')}" + task_modules: + - swh.deposit.loader.tasks + task_queues: - swh.deposit.loader.tasks.ChecksDepositTsk - - swh_loader_deposit - - swh_checker_deposit - # FIXME: Create a dedicated client subsection url: https://deposit.softwareheritage.org auth: username: "%{hiera('deposit_basic_auth_swhworker_username')}" diff --git a/data/location/sesi_rocquencourt.yaml b/data/location/sesi_rocquencourt.yaml --- a/data/location/sesi_rocquencourt.yaml +++ b/data/location/sesi_rocquencourt.yaml @@ -21,6 +21,7 @@ smtp::relayhost: '[smtp.inria.fr]' swh::deploy::worker::instances: + - checker_deposit - lister - loader_debian - loader_deposit diff --git a/site-modules/profile/manifests/swh/deploy/worker/base_deposit.pp b/site-modules/profile/manifests/swh/deploy/worker/base_deposit.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/base_deposit.pp @@ -0,0 +1,7 @@ +class profile::swh::deploy::worker::base_deposit { + $packages = ['python3-swh.deposit.loader'] + + package {$packages: + ensure => 'present', + } +} diff --git a/site-modules/profile/manifests/swh/deploy/worker/checker_deposit.pp b/site-modules/profile/manifests/swh/deploy/worker/checker_deposit.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/checker_deposit.pp @@ -0,0 +1,10 @@ +# Deployment for deposit's archive checker +class profile::swh::deploy::worker::checker_deposit { + include ::profile::swh::deploy::worker::checker_deposit + + $private_tmp = lookup('swh::deploy::worker::checker_deposit::private_tmp') + ::profile::swh::deploy::worker::instance {'checker_deposit': + ensure => 'present', + private_tmp => $private_tmp, + } +} diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_deposit.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_deposit.pp --- a/site-modules/profile/manifests/swh/deploy/worker/loader_deposit.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/loader_deposit.pp @@ -1,18 +1,8 @@ -# Deployment for swh-loader-deposit +# Deployment for deposit's loader class profile::swh::deploy::worker::loader_deposit { - $packages = ['python3-swh.deposit.loader'] $private_tmp = lookup('swh::deploy::worker::loader_deposit::private_tmp') - - package {$packages: - ensure => 'present', - } - - # This installs the swh-worker@$service_name service ::profile::swh::deploy::worker::instance {'loader_deposit': ensure => 'present', private_tmp => $private_tmp, - require => [ - Package[$packages], - ], } }