From 8ab17dfbe81b201cc4acd0e6d09c622b74971a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 17 Jan 2022 13:10:03 +0100 Subject: [PATCH] Adjust the hostname of the datanommer DB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py | 2 +- .../datanommer/templates/fedora-messaging-config.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py b/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py index d99ae6d777..8b771adef4 100644 --- a/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py +++ b/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py @@ -4,7 +4,7 @@ APP_PATH = "https://apps{{ env_suffix }}.fedoraproject.org/datagrepper2" DEFAULT_QUERY_DELTA = 3600 -DATANOMMER_SQLALCHEMY_URL = "postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2" +DATANOMMER_SQLALCHEMY_URL = "postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer{{ (env == 'production')|ternary('02', '01') }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2" # Only allow ajax/websockets connections back to our domains. # https://github.com/fedora-infra/datagrepper/pull/192 diff --git a/roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml b/roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml index 3385d3bb67..fff648373f 100644 --- a/roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml +++ b/roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml @@ -32,7 +32,7 @@ exchange = "amq.topic" routing_keys = ["#"] [consumer_config] -datanommer_sqlalchemy_url = 'postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2' +datanommer_sqlalchemy_url = 'postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer{{ (env == 'production')|ternary('02', '01') }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2' [log_config] version = 1