indexer_mimetype: Update configuration

Related T1525

data/defaults.yaml

@@ -2012,7 +2012,7 @@ swh::deploy::indexer_journal_client::config:
   consumer_id: swh.indexer.journal_client
   scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
 
-swh::deploy::worker::swh_indexer::mimetype::config_file: "mimetype.yml"
+swh::deploy::worker::swh_indexer::mimetype::config_file: "%{hiera('swh::conf_directory')}/indexer_content_mimetype.yml"
 swh::deploy::worker::swh_indexer::mimetype::concurrency: 1
 swh::deploy::worker::swh_indexer::mimetype::loglevel: info
 # Contains a password: in private data
@@ -2022,6 +2022,13 @@ swh::deploy::worker::swh_indexer::mimetype::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
   storage: "%{alias('swh::remote_service::storage::config::azure')}"
+  celery:
+    task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"
+    task_modules:
+      - swh.indexer.tasks
+    task_queues:
+      - swh.indexer.tasks.ContentMimetype
+      - swh.indexer.tasks.ContentRangeMimetype
 
 swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config_file: "%{hiera('swh::conf_directory')}/indexer_origin_intrinsic_metadata.yml"
 swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::concurrency: 2

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

@@ -8,14 +8,12 @@ class profile::swh::deploy::worker::swh_indexer_mimetype {
   $task_broker = lookup('swh::deploy::worker::swh_indexer::mimetype::task_broker')
 
   $config_file = lookup('swh::deploy::worker::swh_indexer::mimetype::config_file')
-  $config_directory = lookup('swh::deploy::base_indexer::config_directory')
-  $config_path = "${config_directory}/${config_file}"
   $config = lookup('swh::deploy::worker::swh_indexer::mimetype::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_mimetype', 'swh_indexer_content_mimetype_range']
 
-  Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_mimetype':
+  Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_mimetype':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
@@ -25,11 +23,11 @@ class profile::swh::deploy::worker::swh_indexer_mimetype {
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
-      File[$config_path],
+      File[$config_file],
     ],
   }
 
-  file {$config_path:
+  file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',

[Phabricator Migration user]

Some references in the commit message have been migrated:

• T1525 is now #1525 (closed)