From 270f45c58cba58b8bca0508f8cd525e7c37ce60b Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Fri, 15 Feb 2019 15:17:54 +0100
Subject: [PATCH] worker: Update configuration file path
Related T1525
---
data/defaults.yaml | 2 +-
.../deploy/worker/swh_indexer_origin_intrinsic_metadata.pp | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/data/defaults.yaml b/data/defaults.yaml
index 7bdf14adb..98a806a5a 100644
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -2023,7 +2023,7 @@ swh::deploy::worker::swh_indexer::mimetype::config:
objstorage: "%{alias('swh::remote_service::objstorage::config')}"
storage: "%{alias('swh::remote_service::storage::config::azure')}"
-swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config_file: "origin_intrinsic_metadata.yml"
+swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config_file: "%{hiera('swh::conf_directory')}/indexer_origin_intrinsic_metadata.yml"
swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::concurrency: 2
swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::loglevel: info
# Contains a password: in private data
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
index 75816f63a..d3361adb8 100644
--- 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
@@ -8,8 +8,6 @@ class profile::swh::deploy::worker::swh_indexer_origin_intrinsic_metadata {
$task_broker = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::task_broker')
$config_file = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config_file')
- $config_directory = lookup('swh::deploy::base_indexer::config_directory')
- $config_path = "${config_directory}/${config_file}"
$config = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config')
$task_modules = ['swh.indexer.tasks']
@@ -25,11 +23,11 @@ class profile::swh::deploy::worker::swh_indexer_origin_intrinsic_metadata {
require => [
Class['profile::swh::deploy::indexer'],
Class['profile::swh::deploy::objstorage_cloud'],
- File[$config_path],
+ File[$config_file],
],
}
- file {$config_path:
+ file {$config_file:
ensure => 'present',
owner => 'swhworker',
group => 'swhdev',
--
GitLab