From e7702b7b5034d4abe35972783fe0c9a2b383dcac Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Sat, 16 Feb 2019 00:28:25 +0100
Subject: [PATCH] loader-mercurial: Update configuration
Related T1525
---
data/defaults.yaml | 10 ++++++++++
.../swh/deploy/worker/swh_loader_mercurial.pp | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/data/defaults.yaml b/data/defaults.yaml
index 5d2ef48ef..8b983db9c 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 5cf921879..ca5749e37 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']
--
GitLab