diff --git a/data/defaults.yaml b/data/defaults.yaml index 5d2ef48ef6590aa09d6959b1b9b50f2b39775dc5..8b983db9ca2e3a4758f2931f6baf92f39b57a7bb 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1910,6 +1910,7 @@ swh::deploy::worker::swh_loader_git_disk::config: storage: "%{alias('swh::remote_service::storage::config')}" directory_packet_size: 100 +swh::deploy::worker::swh_loader_mercurial::config_file: "%{hiera('swh::conf_directory')}/loader_mercurial.yml" swh::deploy::worker::swh_loader_mercurial::concurrency: 1 swh::deploy::worker::swh_loader_mercurial::private_tmp: true swh::deploy::worker::swh_loader_mercurial::loglevel: info @@ -1917,6 +1918,15 @@ swh::deploy::worker::swh_loader_mercurial::task_broker: "%{hiera('swh::deploy::w swh::deploy::worker::swh_loader_mercurial::config: storage: "%{alias('swh::remote_service::storage::config')}" reduce_effort: False + celery: + task_broker: "%{alias('swh::deploy::scheduler::task_broker')}" + task_modules: + - swh.loader.mercurial.tasks + task_queues: + - swh.loader.mercurial.tasks.LoadMercurial + - swh.loader.mercurial.tasks.LoadArchiveMercurial + - swh_loader_mercurial + - swh_loader_mercurial_archive swh::deploy::worker::swh_loader_pypi::config_file: "%{hiera('swh::conf_directory')}/loader_pypi.yml" swh::deploy::worker::swh_loader_pypi::concurrency: 1 diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_mercurial.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_loader_mercurial.pp index 5cf9218799d9973d20ef8b7b4885528165285c38..ca5749e37b05a0498359cad60ca6e8ce5e2c535a 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_mercurial.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_loader_mercurial.pp @@ -6,13 +6,13 @@ class profile::swh::deploy::worker::swh_loader_mercurial { $loglevel = lookup('swh::deploy::worker::swh_loader_mercurial::loglevel') $task_broker = lookup('swh::deploy::worker::swh_loader_mercurial::task_broker') - $config_file = '/etc/softwareheritage/loader/hg.yml' + $config_file = lookup('swh::deploy::worker::swh_loader_mercurial::config_file') $config = lookup('swh::deploy::worker::swh_loader_mercurial::config') $task_modules = ['swh.loader.mercurial.tasks'] $task_queues = ['swh_loader_mercurial', 'swh_loader_mercurial_archive'] - $service_name = 'swh_loader_mercurial' + $service_name = 'loader_mercurial' $private_tmp = lookup('swh::deploy::worker::swh_loader_mercurial::private_tmp') $packages = ['python3-swh.loader.mercurial']