From e453ce164908bcfd1615250baf014edc7beac5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 14 Jun 2022 16:06:43 +0200 Subject: [PATCH] Add expected number of odcs backends This value is mostly ignored by the application. It is included in the Prometheus metrics to simplify calculation availability. The default is set to 0. The number of hosts in the odcs_backend group is used for the alternative definition in inventory. --- inventory/group_vars/odcs | 1 + roles/odcs/base/defaults/main.yml | 2 +- roles/odcs/base/templates/etc/odcs/config.py.j2 | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/odcs b/inventory/group_vars/odcs index 3785c4f543..438263666a 100644 --- a/inventory/group_vars/odcs +++ b/inventory/group_vars/odcs @@ -64,3 +64,4 @@ odcs_raw_config_urls: config_filename: test.conf url: https://pagure.io/jkaluza-test-compose.git primary_auth_source: ipa +odcs_expected_backend_number: "{{ groups['odcs_backend'] | length }}" diff --git a/roles/odcs/base/defaults/main.yml b/roles/odcs/base/defaults/main.yml index 8a49402095..f35d98f2f4 100644 --- a/roles/odcs/base/defaults/main.yml +++ b/roles/odcs/base/defaults/main.yml @@ -49,4 +49,4 @@ odcs_seconds_to_live: 86400 odcs_max_seconds_to_live: 259200 odcs_celery_concurrency: 2 odcs_extra_target_dirs: {"private": "/srv/odcs/private"} - +odcs_expected_backend_number: 0 diff --git a/roles/odcs/base/templates/etc/odcs/config.py.j2 b/roles/odcs/base/templates/etc/odcs/config.py.j2 index b13974e646..ea10689af3 100644 --- a/roles/odcs/base/templates/etc/odcs/config.py.j2 +++ b/roles/odcs/base/templates/etc/odcs/config.py.j2 @@ -168,3 +168,5 @@ class ProdConfiguration(BaseConfiguration): CELERY_ROUTER_CONFIG = {{ odcs_celery_router_config }} {% endif %} + EXPECTED_BACKEND_NUMBER = {{ odcs_expected_backend_number }} +