From b675234a945bb1a7d1bd51b12d96ae098f327d14 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Tue, 12 Feb 2019 13:43:22 +0100
Subject: [PATCH] scheduler: Factorize configuration for listener/runner/api
Related T1525
---
data/defaults.yaml | 15 +++++++++++----
.../saatchi.internal.softwareheritage.org.yaml | 6 +-----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/data/defaults.yaml b/data/defaults.yaml
index 7c8661145..16acd476c 100644
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1708,6 +1708,13 @@ swh::deploy::webapp::locked_endpoints:
- /api/1/entity/
- /api/1/provenance/
+# local configuration for the scheduler
+swh::deploy::scheduler::config::local: &swh_scheduler_local_config
+ scheduler:
+ cls: local
+ args:
+ db: "host=%{hiera('swh::deploy::scheduler::db::host')} dbname=%{hiera('swh::deploy::scheduler::db::dbname')} user=%{hiera('swh::deploy::scheduler::db::user')} password=%{hiera('swh::deploy::scheduler::db::password')}"
+
swh::deploy::scheduler::conf_file: "%{hiera('swh::conf_directory')}/scheduler.yml"
swh::deploy::scheduler::user: swhscheduler
swh::deploy::scheduler::group: swhscheduler
@@ -1720,10 +1727,10 @@ swh::deploy::scheduler::task_broker: "amqp://swhproducer:%{hiera('swh::deploy::s
swh::deploy::scheduler::listener::log_level: INFO
swh::deploy::scheduler::runner::log_level: INFO
swh::deploy::scheduler::config:
- scheduler:
- cls: local
- args:
- db: "host=%{hiera('swh::deploy::scheduler::db::host')} dbname=%{hiera('swh::deploy::scheduler::db::dbname')} user=%{hiera('swh::deploy::scheduler::db::user')} password=%{hiera('swh::deploy::scheduler::db::password')}"
+ <<: *swh_scheduler_local_config
+ celery:
+ task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"
+
swh::deploy::scheduler::task_packages:
- python3-swh.lister
- python3-swh.loader.debian
diff --git a/data/hostname/saatchi.internal.softwareheritage.org.yaml b/data/hostname/saatchi.internal.softwareheritage.org.yaml
index c17386f83..77795bf91 100644
--- a/data/hostname/saatchi.internal.softwareheritage.org.yaml
+++ b/data/hostname/saatchi.internal.softwareheritage.org.yaml
@@ -3,8 +3,4 @@ dar::backup::exclude:
swh::deploy::scheduler::remote::backend::listen::host: 0.0.0.0
-swh::deploy::scheduler::remote::config:
- scheduler:
- cls: local
- args:
- db: "%{hiera('swh::deploy::scheduler::database')}"
+swh::deploy::scheduler::remote::config: "%{alias('swh::deploy::scheduler::config::local')}"
--
GitLab