indexer: Align keys with service name

Related T1525
Related T1531

data/defaults.yaml

@@ -2095,11 +2095,11 @@ swh::deploy::indexer_journal_client::config:
   consumer_id: swh.indexer.journal_client
   scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
 
-swh::deploy::worker::indexer::mimetype::config_file: "%{hiera('swh::conf_directory')}/indexer_content_mimetype.yml"
-swh::deploy::worker::indexer::mimetype::concurrency: 1
-swh::deploy::worker::indexer::mimetype::loglevel: info
+swh::deploy::worker::indexer_mimetype::config_file: "%{hiera('swh::conf_directory')}/indexer_content_mimetype.yml"
+swh::deploy::worker::indexer_mimetype::concurrency: 1
+swh::deploy::worker::indexer_mimetype::loglevel: info
 # Contains a password: in private data
-swh::deploy::worker::indexer::mimetype::config:
+swh::deploy::worker::indexer_mimetype::config:
   scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
@@ -2113,11 +2113,11 @@ swh::deploy::worker::indexer::mimetype::config:
       - swh.indexer.tasks.ContentRangeMimetype
       - swh_indexer_content_mimetype_range
 
-swh::deploy::worker::indexer::origin_intrinsic_metadata::config_file: "%{hiera('swh::conf_directory')}/indexer_origin_intrinsic_metadata.yml"
-swh::deploy::worker::indexer::origin_intrinsic_metadata::concurrency: 2
-swh::deploy::worker::indexer::origin_intrinsic_metadata::loglevel: info
+swh::deploy::worker::indexer_origin_intrinsic_metadata::config_file: "%{hiera('swh::conf_directory')}/indexer_origin_intrinsic_metadata.yml"
+swh::deploy::worker::indexer_origin_intrinsic_metadata::concurrency: 2
+swh::deploy::worker::indexer_origin_intrinsic_metadata::loglevel: info
 # Contains a password: in private data
-swh::deploy::worker::indexer::origin_intrinsic_metadata::config:
+swh::deploy::worker::indexer_origin_intrinsic_metadata::config:
   scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
@@ -2129,11 +2129,11 @@ swh::deploy::worker::indexer::origin_intrinsic_metadata::config:
     task_queues:
       - swh.indexer.tasks.OriginMetadata
 
-swh::deploy::worker::indexer::rehash::config_file: "rehash.yml"
-swh::deploy::worker::indexer::rehash::concurrency: 5
-swh::deploy::worker::indexer::rehash::loglevel: info
+swh::deploy::worker::indexer_rehash::config_file: "rehash.yml"
+swh::deploy::worker::indexer_rehash::concurrency: 5
+swh::deploy::worker::indexer_rehash::loglevel: info
 # Contains a password: in private data
-swh::deploy::worker::indexer::rehash::config:
+swh::deploy::worker::indexer_rehash::config:
   # Needs write access: explicitly configured to use uffizi
   storage: "%{alias('swh::remote_service::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
@@ -2142,11 +2142,11 @@ swh::deploy::worker::indexer::rehash::config:
   batch_size_retrieve_content: 10000
   batch_size_update: 5000
 
-swh::deploy::worker::indexer::fossology_license::config_file: "%{hiera('swh::conf_directory')}/indexer_fossology_license.yml"
-swh::deploy::worker::indexer::fossology_license::concurrency: 1
-swh::deploy::worker::indexer::fossology_license::loglevel: info
+swh::deploy::worker::indexer_fossology_license::config_file: "%{hiera('swh::conf_directory')}/indexer_fossology_license.yml"
+swh::deploy::worker::indexer_fossology_license::concurrency: 1
+swh::deploy::worker::indexer_fossology_license::loglevel: info
 # Contains a password: in private data
-swh::deploy::worker::indexer::fossology_license::config:
+swh::deploy::worker::indexer_fossology_license::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
   storage: "%{alias('swh::remote_service::storage::config::azure')}"
@@ -2165,11 +2165,11 @@ swh::deploy::worker::indexer::fossology_license::config:
       - swh.indexer.tasks.ContentRangeFossologyLicense
       - swh_indexer_content_fossology_license_range
 
-swh::deploy::worker::indexer::language::config_file: "%{hiera('swh::conf_directory')}/indexer_content_language.yml"
-swh::deploy::worker::indexer::language::concurrency: 3
-swh::deploy::worker::indexer::language::loglevel: info
+swh::deploy::worker::indexer_language::config_file: "%{hiera('swh::conf_directory')}/indexer_content_language.yml"
+swh::deploy::worker::indexer_language::concurrency: 3
+swh::deploy::worker::indexer_language::loglevel: info
 # Contains a password: in private data
-swh::deploy::worker::indexer::language::config:
+swh::deploy::worker::indexer_language::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
   tools:
@@ -2186,12 +2186,12 @@ swh::deploy::worker::indexer::language::config:
     task_queues:
       - swh.indexer.tasks.ContentLanguage
 
-swh::deploy::worker::indexer::ctags::config_file: "%{hiera('swh::conf_directory')}/indexer_content_ctags.yml"
-swh::deploy::worker::indexer::ctags::concurrency: 2
-swh::deploy::worker::indexer::ctags::loglevel: info
+swh::deploy::worker::indexer_ctags::config_file: "%{hiera('swh::conf_directory')}/indexer_content_ctags.yml"
+swh::deploy::worker::indexer_ctags::concurrency: 2
+swh::deploy::worker::indexer_ctags::loglevel: info
 # Contains a password: in private data
 # objstorage configuration from swh::azure_objstorage::config is merged in the manifest
-swh::deploy::worker::indexer::ctags::config:
+swh::deploy::worker::indexer_ctags::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
   workdir: /tmp/swh/indexer.ctags/

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

@@ -3,11 +3,11 @@
 class profile::swh::deploy::worker::indexer_ctags {
   include ::profile::swh::deploy::indexer
 
-  $concurrency = lookup('swh::deploy::worker::indexer::ctags::concurrency')
-  $loglevel = lookup('swh::deploy::worker::indexer::ctags::loglevel')
+  $concurrency = lookup('swh::deploy::worker::indexer_ctags::concurrency')
+  $loglevel = lookup('swh::deploy::worker::indexer_ctags::loglevel')
 
-  $config_file = lookup('swh::deploy::worker::indexer::ctags::config_file')
-  $config = lookup('swh::deploy::worker::indexer::ctags::config')
+  $config_file = lookup('swh::deploy::worker::indexer_ctags::config_file')
+  $config = lookup('swh::deploy::worker::indexer_ctags::config')
 
   $packages = ['universal-ctags']
   package {$packages:

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

@@ -3,11 +3,11 @@
 class profile::swh::deploy::worker::indexer_fossology_license {
   include ::profile::swh::deploy::indexer
 
-  $concurrency = lookup('swh::deploy::worker::indexer::fossology_license::concurrency')
-  $loglevel = lookup('swh::deploy::worker::indexer::fossology_license::loglevel')
+  $concurrency = lookup('swh::deploy::worker::indexer_fossology_license::concurrency')
+  $loglevel = lookup('swh::deploy::worker::indexer_fossology_license::loglevel')
 
-  $config_file = lookup('swh::deploy::worker::indexer::fossology_license::config_file')
-  $config = lookup('swh::deploy::worker::indexer::fossology_license::config')
+  $config_file = lookup('swh::deploy::worker::indexer_fossology_license::config_file')
+  $config = lookup('swh::deploy::worker::indexer_fossology_license::config')
 
   $packages = ['fossology-nomossa']
   package {$packages:

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

@@ -3,11 +3,11 @@
 class profile::swh::deploy::worker::indexer_language {
   include ::profile::swh::deploy::indexer
 
-  $concurrency = lookup('swh::deploy::worker::indexer::language::concurrency')
-  $loglevel = lookup('swh::deploy::worker::indexer::language::loglevel')
+  $concurrency = lookup('swh::deploy::worker::indexer_language::concurrency')
+  $loglevel = lookup('swh::deploy::worker::indexer_language::loglevel')
 
-  $config_file = lookup('swh::deploy::worker::indexer::language::config_file')
-  $config = lookup('swh::deploy::worker::indexer::language::config')
+  $config_file = lookup('swh::deploy::worker::indexer_language::config_file')
+  $config = lookup('swh::deploy::worker::indexer_language::config')
 
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_language':
     ensure       => 'stopped',

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

@@ -3,11 +3,11 @@
 class profile::swh::deploy::worker::indexer_mimetype {
   include ::profile::swh::deploy::indexer
 
-  $concurrency = lookup('swh::deploy::worker::indexer::mimetype::concurrency')
-  $loglevel = lookup('swh::deploy::worker::indexer::mimetype::loglevel')
+  $concurrency = lookup('swh::deploy::worker::indexer_mimetype::concurrency')
+  $loglevel = lookup('swh::deploy::worker::indexer_mimetype::loglevel')
 
-  $config_file = lookup('swh::deploy::worker::indexer::mimetype::config_file')
-  $config = lookup('swh::deploy::worker::indexer::mimetype::config')
+  $config_file = lookup('swh::deploy::worker::indexer_mimetype::config_file')
+  $config = lookup('swh::deploy::worker::indexer_mimetype::config')
 
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_mimetype':
     ensure       => present,

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

@@ -3,11 +3,11 @@
 class profile::swh::deploy::worker::indexer_origin_intrinsic_metadata {
   include ::profile::swh::deploy::indexer
 
-  $concurrency = lookup('swh::deploy::worker::indexer::origin_intrinsic_metadata::concurrency')
-  $loglevel = lookup('swh::deploy::worker::indexer::origin_intrinsic_metadata::loglevel')
+  $concurrency = lookup('swh::deploy::worker::indexer_origin_intrinsic_metadata::concurrency')
+  $loglevel = lookup('swh::deploy::worker::indexer_origin_intrinsic_metadata::loglevel')
 
-  $config_file = lookup('swh::deploy::worker::indexer::origin_intrinsic_metadata::config_file')
-  $config = lookup('swh::deploy::worker::indexer::origin_intrinsic_metadata::config')
+  $config_file = lookup('swh::deploy::worker::indexer_origin_intrinsic_metadata::config_file')
+  $config = lookup('swh::deploy::worker::indexer_origin_intrinsic_metadata::config')
 
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_origin_intrinsic_metadata':
     ensure       => present,

[Phabricator Migration user]

Some references in the commit message have been migrated:

• T1525 is now #1525 (closed)
• T1531 is now #1531 (closed)