rehash: Align keys with service name and fix configuration

Related T1525
Related T1531

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

@@ -3,13 +3,11 @@
 class profile::swh::deploy::worker::indexer_rehash {
   include ::profile::swh::deploy::indexer
 
-  $concurrency = lookup('swh::deploy::worker::indexer::rehash::concurrency')
-  $loglevel = lookup('swh::deploy::worker::indexer::rehash::loglevel')
+  $concurrency = lookup('swh::deploy::worker::indexer_rehash::concurrency')
+  $loglevel = lookup('swh::deploy::worker::indexer_rehash::loglevel')
 
-  $config_file = lookup('swh::deploy::worker::indexer::rehash::config_file')
-  $config_directory = lookup('swh::deploy::base_indexer::config_directory')
-  $config_path = "${config_directory}/${config_file}"
-  $config = lookup('swh::deploy::worker::indexer::rehash::config')
+  $config_file = lookup('swh::deploy::worker::indexer_rehash::config_file')
+  $config = lookup('swh::deploy::worker::indexer_rehash::config')
 
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_rehash':
     ensure       => 'stopped',
@@ -18,11 +16,11 @@ class profile::swh::deploy::worker::indexer_rehash {
     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)
• T1531 is now #1531 (closed)