Page MenuHomeSoftware Heritage

D655.id2039.diff
No OneTemporary

D655.id2039.diff

diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1937,26 +1937,6 @@
- banco
max_queue_length: "%{hiera('swh::deploy::worker::swh_storage_archiver::max_queue_length')}"
-swh::deploy::worker::swh_indexer::orchestrator::concurrency: 2
-swh::deploy::worker::swh_indexer::orchestrator::loglevel: info
-swh::deploy::worker::swh_indexer::orchestrator::task_broker: "%{hiera('swh::deploy::worker::task_broker')}"
-swh::deploy::worker::swh_indexer::orchestrator::config:
- scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
- indexers:
- indexer_mimetype:
- batch_size: 100
- check_presence: false
-
-swh::deploy::worker::swh_indexer::orchestrator_text::concurrency: 2
-swh::deploy::worker::swh_indexer::orchestrator_text::loglevel: info
-swh::deploy::worker::swh_indexer::orchestrator_text::task_broker: "%{hiera('swh::deploy::worker::task_broker')}"
-swh::deploy::worker::swh_indexer::orchestrator_text::config:
- scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
- indexers:
- indexer_fossology_license:
- batch_size: 100
- check_presence: false
-
swh::deploy::worker::swh_indexer::base::concurrency: 2
swh::deploy::worker::swh_indexer::base::loglevel: info
# Contains a password: in private data
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp
deleted file mode 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Deployment for swh-indexer
-
-class profile::swh::deploy::worker::swh_indexer_orchestrator {
-
- include ::profile::swh::deploy::indexer
-
- $concurrency = lookup('swh::deploy::worker::swh_indexer::orchestrator::concurrency')
- $loglevel = lookup('swh::deploy::worker::swh_indexer::orchestrator::loglevel')
- $task_broker = lookup('swh::deploy::worker::swh_indexer::orchestrator::task_broker')
-
- $config_file = '/etc/softwareheritage/indexer/orchestrator.yml'
- $config = lookup('swh::deploy::worker::swh_indexer::orchestrator::config')
-
- $task_modules = ['swh.indexer.tasks']
- $task_queues = ['swh_indexer_orchestrator_content_all']
-
- Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_orchestrator':
- ensure => present,
- concurrency => $concurrency,
- loglevel => $loglevel,
- task_broker => $task_broker,
- task_modules => $task_modules,
- task_queues => $task_queues,
- require => [
- Class['profile::swh::deploy::indexer'],
- File[$config_file],
- ],
- }
-
- file {$config_file:
- ensure => 'present',
- owner => 'swhworker',
- group => 'swhworker',
- mode => '0644',
- content => inline_template("<%= @config.to_yaml %>\n"),
- }
-}
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp
deleted file mode 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Deployment for swh-indexer
-
-class profile::swh::deploy::worker::swh_indexer_orchestrator_text {
-
- include ::profile::swh::deploy::indexer
-
- $concurrency = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::concurrency')
- $loglevel = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::loglevel')
- $task_broker = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::task_broker')
-
- $config_file = '/etc/softwareheritage/indexer/orchestrator_text.yml'
- $config = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::config')
-
- $task_modules = ['swh.indexer.tasks']
- $task_queues = ['swh_indexer_orchestrator_content_text']
-
- Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_orchestrator_text':
- ensure => present,
- concurrency => $concurrency,
- loglevel => $loglevel,
- task_broker => $task_broker,
- task_modules => $task_modules,
- task_queues => $task_queues,
- require => [
- Class['profile::swh::deploy::indexer'],
- File[$config_file],
- ],
- }
-
- file {$config_file:
- ensure => 'present',
- owner => 'swhworker',
- group => 'swhworker',
- mode => '0644',
- content => inline_template("<%= @config.to_yaml %>\n"),
- }
-}

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 17, 8:48 PM (1 w, 23 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3228210

Event Timeline