diff --git a/manifests/swh/deploy/worker/swh_indexer_language.pp b/manifests/swh/deploy/worker/swh_indexer_language.pp index 99f6077d..097797e2 100644 --- a/manifests/swh/deploy/worker/swh_indexer_language.pp +++ b/manifests/swh/deploy/worker/swh_indexer_language.pp @@ -1,41 +1,25 @@ # Deployment for swh-indexer-language class profile::swh::deploy::worker::swh_indexer_language { include ::profile::swh::deploy::indexer $concurrency = hiera('swh::deploy::worker::swh_indexer::language::concurrency') $loglevel = hiera('swh::deploy::worker::swh_indexer::language::loglevel') $task_broker = hiera('swh::deploy::worker::swh_indexer::language::task_broker') - $config_file = '/etc/softwareheritage/indexer/language.yml' - $config = hiera('swh::deploy::worker::swh_indexer::language::config') - - $objstorage_config = hiera('swh::azure_objstorage::config') - $merged_config = merge($config, {'objstorage' => $objstorage_config}) - $task_modules = ['swh.indexer.tasks'] $task_queues = ['swh_indexer_content_language'] ::profile::swh::deploy::worker::instance {'swh_indexer_language': 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('<%= @merged_config.to_yaml %>'), - } }