From 2db2e07d1f65a2fabc49e391524d241126836462 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Fri, 15 Feb 2019 18:14:34 +0100
Subject: [PATCH] ctags: Update configuration
Related T1525
---
data/defaults.yaml | 9 ++++++++-
.../manifests/swh/deploy/worker/swh_indexer_ctags.pp | 10 ++++------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/data/defaults.yaml b/data/defaults.yaml
index b6508dffa..48516fe9e 100644
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -2124,7 +2124,7 @@ swh::deploy::worker::swh_indexer::language::config:
debian-package: "python3-pygments"
max_content_size: 10240
-swh::deploy::worker::swh_indexer::ctags::config_file: "ctags.yml"
+swh::deploy::worker::swh_indexer::ctags::config_file: "%{hiera('swh::conf_directory')}/indexer_content_ctags.yml"
swh::deploy::worker::swh_indexer::ctags::concurrency: 2
swh::deploy::worker::swh_indexer::ctags::loglevel: info
# Contains a password: in private data
@@ -2139,6 +2139,13 @@ swh::deploy::worker::swh_indexer::ctags::config:
version: '0+git20181215-2'
configuration:
command_line: "ctags --fields=+lnz --sort=no --links=no --output-format=json <filepath>"
+ celery:
+ task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"
+ task_modules:
+ - swh.indexer.tasks
+ task_queues:
+ - swh.indexer.tasks.Ctags
+
languages:
abap: ''
abnf: ''
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_ctags.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_ctags.pp
index 0b939bab4..5e2a531cb 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_ctags.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_ctags.pp
@@ -7,9 +7,7 @@ class profile::swh::deploy::worker::swh_indexer_ctags {
$loglevel = lookup('swh::deploy::worker::swh_indexer::ctags::loglevel')
$task_broker = lookup('swh::deploy::worker::swh_indexer::ctags::task_broker')
- $config_file = lookup('swh::deploy::worker::swh_indexer::language::config_file')
- $config_directory = lookup('swh::deploy::base_indexer::config_directory')
- $config_path = "${config_directory}/${config_file}"
+ $config_file = lookup('swh::deploy::worker::swh_indexer::ctags::config_file')
$config = lookup('swh::deploy::worker::swh_indexer::ctags::config')
$task_modules = ['swh.indexer.tasks']
@@ -20,7 +18,7 @@ class profile::swh::deploy::worker::swh_indexer_ctags {
ensure => 'present',
}
- Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_ctags':
+ Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_ctags':
ensure => present,
concurrency => $concurrency,
loglevel => $loglevel,
@@ -30,12 +28,12 @@ class profile::swh::deploy::worker::swh_indexer_ctags {
require => [
Class['profile::swh::deploy::indexer'],
Class['profile::swh::deploy::objstorage_cloud'],
- File[$config_path],
+ File[$config_file],
Package[$packages],
],
}
- file {$config_path:
+ file {$config_file:
ensure => 'present',
owner => 'swhworker',
group => 'swhdev',
--
GitLab