diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1954,7 +1954,33 @@ scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}" indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}" objstorage: "%{alias('swh::remote_service::objstorage::config')}" - destination_task: orchestrator_text + +swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::concurrency: 1 +swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}" +# Contains a password: in private data +swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::task_broker: "%{hiera('swh::deploy::worker::task_broker')}" +swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config: + scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}" + indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}" + objstorage: "%{alias('swh::remote_service::objstorage::config')}" + +swh::deploy::worker::swh_indexer::origin_head::concurrency: 1 +swh::deploy::worker::swh_indexer::origin_head::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}" +# Contains a password: in private data +swh::deploy::worker::swh_indexer::origin_head::task_broker: "%{hiera('swh::deploy::worker::task_broker')}" +swh::deploy::worker::swh_indexer::origin_head::config: + scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}" + indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}" + objstorage: "%{alias('swh::remote_service::objstorage::config')}" + +swh::deploy::worker::swh_indexer::revision_metadata::concurrency: 3 +swh::deploy::worker::swh_indexer::revision_metadata::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}" +# Contains a password: in private data +swh::deploy::worker::swh_indexer::revision_metadata::task_broker: "%{hiera('swh::deploy::worker::task_broker')}" +swh::deploy::worker::swh_indexer::revision_metadata::config: + scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}" + indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}" + objstorage: "%{alias('swh::remote_service::objstorage::config')}" swh::deploy::worker::swh_indexer::rehash::concurrency: 5 swh::deploy::worker::swh_indexer::rehash::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}" diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_head.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_head.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_head.pp @@ -0,0 +1,38 @@ +# Deployment for swh-indexer-origin-head + +class profile::swh::deploy::worker::swh_indexer_origin_head { + include ::profile::swh::deploy::indexer + + $concurrency = lookup('swh::deploy::worker::swh_indexer::origin_head::concurrency') + $loglevel = lookup('swh::deploy::worker::swh_indexer::origin_head::loglevel') + $task_broker = lookup('swh::deploy::worker::swh_indexer::origin_head::task_broker') + + $config_file = '/etc/softwareheritage/indexer/origin_head.yml' + $config = lookup('swh::deploy::worker::swh_indexer::origin_head::config') + + $task_modules = ['swh.indexer.tasks'] + $task_queues = ['swh_indexer_origin_head'] + + Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_origin_head': + 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"), + } +} diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp @@ -0,0 +1,38 @@ +# Deployment for swh-indexer-origin-intrinsic-metadata + +class profile::swh::deploy::worker::swh_indexer_origin_intrinsic_metadata { + include ::profile::swh::deploy::indexer + + $concurrency = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::concurrency') + $loglevel = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::loglevel') + $task_broker = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::task_broker') + + $config_file = '/etc/softwareheritage/indexer/origin_intrinsic_metadata.yml' + $config = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config') + + $task_modules = ['swh.indexer.tasks'] + $task_queues = ['swh_indexer_content_origin_intrinsic_metadata'] + + Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_origin_intrinsic_metadata': + 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"), + } +} diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp @@ -0,0 +1,39 @@ +# Deployment for swh-indexer-revision-metadata + +class profile::swh::deploy::worker::swh_indexer_revision_metadata { + include ::profile::swh::deploy::indexer + + $concurrency = lookup('swh::deploy::worker::swh_indexer::revision_metadata::concurrency') + $loglevel = lookup('swh::deploy::worker::swh_indexer::revision_metadata::loglevel') + $task_broker = lookup('swh::deploy::worker::swh_indexer::revision_metadata::task_broker') + + $config_file = '/etc/softwareheritage/indexer/revision_metadata.yml' + $config = lookup('swh::deploy::worker::swh_indexer::revision_metadata::config') + + $task_modules = ['swh.indexer.tasks'] + $task_queues = ['swh_indexer_revision_metadata'] + + Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_revision_metadata': + 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"), + } +} +