loader-deposit: Update configuration

Related T1525

data/defaults.yaml

@@ -1541,8 +1541,7 @@ swh::deploy::deposit::settings_private_data:
     password: "%{hiera('swh::deploy::storage::db::password')}"
   media_root: "%{hiera('swh::deploy::deposit::media_root_directory')}"
 
-swh::deploy::worker::swh_loader_deposit::swh_conf_dir: "%{hiera('swh::conf_directory')}/loader"
-swh::deploy::worker::swh_loader_deposit::swh_conf_file: "%{hiera('swh::deploy::worker::swh_loader_deposit::swh_conf_dir')}/deposit.yml"
+swh::deploy::worker::swh_loader_deposit::config_file: "%{hiera('swh::conf_directory')}/loader_deposit.yml"
 swh::deploy::worker::swh_loader_deposit::concurrency: 2
 swh::deploy::worker::swh_loader_deposit::private_tmp: true
 swh::deploy::worker::swh_loader_deposit::loglevel: info
@@ -1550,6 +1549,15 @@ swh::deploy::worker::swh_loader_deposit::task_broker: "%{hiera('swh::deploy::wor
 swh::deploy::worker::swh_loader_deposit::config:
   storage: "%{alias('swh::remote_service::storage::config')}"
   extraction_dir: /tmp/swh.loader.deposit/
+  celery:
+    task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"
+    task_modules:
+      - swh.deposit.loader.tasks
+    task_queues:
+      - swh.deposit.loader.tasks.LoadDepositArchiveTsk
+      - swh.deposit.loader.tasks.ChecksDepositTsk
+      - swh_loader_deposit
+      - swh_checker_deposit
 
 swh::deploy::deposit::client::swh_conf_file: "%{hiera('swh::deploy::deposit::conf_directory')}/client.yml"
 # deposit_basic_auth_swhworker_{username|password} in private_data

site-modules/profile/manifests/swh/deploy/worker/swh_loader_deposit.pp

@@ -5,7 +5,7 @@ class profile::swh::deploy::worker::swh_loader_deposit {
   $task_broker = lookup('swh::deploy::worker::swh_loader_deposit::task_broker')
 
   $deposit_config_directory = lookup('swh::deploy::deposit::conf_directory')
-  $config_file = lookup('swh::deploy::worker::swh_loader_deposit::swh_conf_file')
+  $config_file = lookup('swh::deploy::worker::swh_loader_deposit::config_file')
   $config = lookup('swh::deploy::worker::swh_loader_deposit::config')
 
   $task_modules = ['swh.deposit.loader.tasks']
@@ -14,7 +14,7 @@ class profile::swh::deploy::worker::swh_loader_deposit {
   $packages = ['python3-swh.deposit.loader']
   $private_tmp = lookup('swh::deploy::worker::swh_loader_deposit::private_tmp')
 
-  $service_name = 'swh_loader_deposit'
+  $service_name = 'loader_deposit'
 
   package {$packages:
     ensure => 'latest',
@@ -49,9 +49,6 @@ class profile::swh::deploy::worker::swh_loader_deposit {
     group   => 'swhdev',
     mode    => '0640',
     content => inline_template("<%= @config.to_yaml %>\n"),
-    require      => [
-      File[$deposit_config_directory],
-    ],
   }
 
   $swh_client_conf_file = lookup('swh::deploy::deposit::client::swh_conf_file')

[Phabricator Migration user]

Some references in the commit message have been migrated:

• T1525 is now #1525 (closed)