diff --git a/manifests/swh/deploy/worker/swh_loader_git_archive.pp b/manifests/swh/deploy/worker/swh_loader_git_archive.pp deleted file mode 100644 index 07086977..00000000 --- a/manifests/swh/deploy/worker/swh_loader_git_archive.pp +++ /dev/null @@ -1,35 +0,0 @@ -# Deployment for swh-loader-git (archive) -class profile::swh::deploy::worker::swh_loader_git_archive { - include ::profile::swh::deploy::base_loader_git - - $concurrency = hiera('swh::deploy::worker::swh_loader_git_archive::concurrency') - $loglevel = hiera('swh::deploy::worker::swh_loader_git_archive::loglevel') - $task_broker = hiera('swh::deploy::worker::swh_loader_git_archive::task_broker') - - $config_file = '/etc/softwareheritage/loader/archive-git-loader.yml' - $config = hiera('swh::deploy::worker::swh_loader_git_archive::config') - - $task_modules = ['swh.loader.git.tasks'] - $task_queues = ['swh_loader_git_archive'] - - ::profile::swh::deploy::worker::instance {'swh_loader_git_archive': - ensure => present, - concurrency => $concurrency, - loglevel => $loglevel, - task_broker => $task_broker, - task_modules => $task_modules, - task_queues => $task_queues, - require => [ - Class['profile::swh::deploy::base_loader_git'], - File[$config_file], - ], - } - - file {$config_file: - ensure => 'present', - owner => 'swhworker', - group => 'swhworker', - mode => '0644', - content => inline_template('<%= @config.to_yaml %>'), - } -} diff --git a/manifests/swh/deploy/worker/swh_loader_git_disk.pp b/manifests/swh/deploy/worker/swh_loader_git_disk.pp index 84805062..77d22ebe 100644 --- a/manifests/swh/deploy/worker/swh_loader_git_disk.pp +++ b/manifests/swh/deploy/worker/swh_loader_git_disk.pp @@ -1,35 +1,35 @@ # Deployment for swh-loader-git (disk) class profile::swh::deploy::worker::swh_loader_git_disk { include ::profile::swh::deploy::base_loader_git $concurrency = hiera('swh::deploy::worker::swh_loader_git_disk::concurrency') $loglevel = hiera('swh::deploy::worker::swh_loader_git_disk::loglevel') $task_broker = hiera('swh::deploy::worker::swh_loader_git_disk::task_broker') $config_file = '/etc/softwareheritage/loader/git-loader.yml' $config = hiera('swh::deploy::worker::swh_loader_git_disk::config') $task_modules = ['swh.loader.git.tasks'] - $task_queues = ['swh_loader_git_express'] + $task_queues = ['swh_loader_git_express', 'swh_loader_git_archive'] ::profile::swh::deploy::worker::instance {'swh_loader_git_disk': ensure => present, concurrency => $concurrency, loglevel => $loglevel, task_broker => $task_broker, task_modules => $task_modules, task_queues => $task_queues, require => [ Class['profile::swh::deploy::base_loader_git'], File[$config_file], ], } file {$config_file: ensure => 'present', owner => 'swhworker', group => 'swhworker', mode => '0644', content => inline_template('<%= @config.to_yaml %>'), } }