diff --git a/manifests/swh/deploy/worker/swh_indexer_rehash.pp b/manifests/swh/deploy/worker/swh_indexer_rehash.pp index 3a085d43..a49cbcdb 100644 --- a/manifests/swh/deploy/worker/swh_indexer_rehash.pp +++ b/manifests/swh/deploy/worker/swh_indexer_rehash.pp @@ -1,38 +1,41 @@ # Deployment for swh-indexer-rehash class profile::swh::deploy::worker::swh_indexer_rehash { include ::profile::swh::deploy::indexer $concurrency = hiera('swh::deploy::worker::swh_indexer::rehash::concurrency') $loglevel = hiera('swh::deploy::worker::swh_indexer::rehash::loglevel') $task_broker = hiera('swh::deploy::worker::swh_indexer::rehash::task_broker') $config_file = '/etc/softwareheritage/indexer/rehash.yml' $config = hiera('swh::deploy::worker::swh_indexer::rehash::config') + $objstorage_config = hiera('swh::deploy::worker::swh_indexer::rehash::objstorage') + $merged_config = merge($config, {'objstorage' => $objstorage_config}) + $task_modules = ['swh.indexer.tasks'] $task_queues = ['swh_indexer_content_rehash'] ::profile::swh::deploy::worker::instance {'swh_indexer_rehash': ensure => present, concurrency => $concurrency, loglevel => $loglevel, task_broker => $task_broker, task_modules => $task_modules, task_queues => $task_queues, require => [ Class['profile::swh::deploy::indexer'], Class['profile::swh::deploy::objstorage_cloud'], File[$config_file], ], } file {$config_file: ensure => 'present', owner => 'swhworker', group => 'swhdev', # Contains passwords mode => '0640', - content => inline_template("<%= @config.to_yaml %>\n"), + content => inline_template("<%= @merged_config.to_yaml %>\n"), } }