From 55234288282e107854b960660e4b20ac11046e8c Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Sep 17 2021 08:32:35 +0000 Subject: Datanommer: use a different DB password on staging Signed-off-by: Aurélien Bompard --- diff --git a/roles/badges/backend/templates/datanommer.py b/roles/badges/backend/templates/datanommer.py index 747b91f..810dbc7 100644 --- a/roles/badges/backend/templates/datanommer.py +++ b/roles/badges/backend/templates/datanommer.py @@ -1,6 +1,6 @@ config = { {% if env == "staging" %} - 'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer2', + 'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommer_stg_db_password}}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer2', {% else %} 'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer/datanommer', {% endif %} diff --git a/roles/datagrepper/templates/datagrepper-fedmsg.py b/roles/datagrepper/templates/datagrepper-fedmsg.py index ff3a45e..c549503 100644 --- a/roles/datagrepper/templates/datagrepper-fedmsg.py +++ b/roles/datagrepper/templates/datagrepper-fedmsg.py @@ -9,7 +9,7 @@ config = { # and we don't want *read* operations on that database to slow down all our # other apps. {% if env == "staging" %} - 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer', + 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommer_stg_db_password }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer', 'fedmenu_url': 'https://apps.stg.fedoraproject.org/fedmenu', 'fedmenu_data_url': 'https://apps.stg.fedoraproject.org/js/data.js', {% else %} diff --git a/roles/fedmsg/datanommer/templates/alembic.ini b/roles/fedmsg/datanommer/templates/alembic.ini index 8257e00..fa2b2da 100644 --- a/roles/fedmsg/datanommer/templates/alembic.ini +++ b/roles/fedmsg/datanommer/templates/alembic.ini @@ -12,7 +12,7 @@ script_location = /usr/share/datanommer.models/alembic/ {% if env == "production" %} sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01/datanommer {% else %} -sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer +sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommer_stg_db_password }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer {% endif %} fedmsg_config_dir = /etc/fedmsg.d/ diff --git a/roles/fedmsg/datanommer/templates/datanommer.py b/roles/fedmsg/datanommer/templates/datanommer.py index 44feee0..35179ec 100644 --- a/roles/fedmsg/datanommer/templates/datanommer.py +++ b/roles/fedmsg/datanommer/templates/datanommer.py @@ -4,6 +4,6 @@ config = { {% if env == "production" %} 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.iad2.fedoraproject.org/datanommer', {% else %} - 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer', + 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommer_stg_db_password }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer', {% endif %} } diff --git a/roles/notifs/frontend/templates/fmn.web.py b/roles/notifs/frontend/templates/fmn.web.py index 10615df..66e04a8 100644 --- a/roles/notifs/frontend/templates/fmn.web.py +++ b/roles/notifs/frontend/templates/fmn.web.py @@ -2,7 +2,7 @@ config = { # This is for *our* database "fmn.sqlalchemy.uri": "postgresql://{{notifs_db_user}}:{{notifs_db_password}}@db01.iad2.fedoraproject.org/notifications", # And this is for the datanommer database - "datanommer.sqlalchemy.url": "postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer01.iad2.fedoraproject.org/datanommer", + "datanommer.sqlalchemy.url": "postgresql://{{datanommerDBUser}}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer01.iad2.fedoraproject.org/datanommer", {% if env == 'staging' %} "fmn.backends": ["email", "irc", "android"], diff --git a/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py b/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py index 2c96338..10b6178 100644 --- a/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py +++ b/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py @@ -4,4 +4,4 @@ APP_PATH = "https://apps{{ env_suffix }}.fedoraproject.org/datagrepper2" DEFAULT_QUERY_DELTA = 3600 -DATANOMMER_SQLALCHEMY_URL = "postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2" +DATANOMMER_SQLALCHEMY_URL = "postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2" diff --git a/roles/openshift-apps/datanommer/templates/alembic.ini b/roles/openshift-apps/datanommer/templates/alembic.ini index 7a1541e..cd71fd1 100644 --- a/roles/openshift-apps/datanommer/templates/alembic.ini +++ b/roles/openshift-apps/datanommer/templates/alembic.ini @@ -2,7 +2,7 @@ # path to migration scripts script_location = /opt/app-root/src/datanommer.models/alembic # database url -sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2 +sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2 # Logging configuration [loggers] diff --git a/roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml b/roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml index dc87bf2..9e05150 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 }}:{{ datanommerDBPassword }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2' +datanommer_sqlalchemy_url = 'postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer01{{ env_suffix }}.iad2.fedoraproject.org/datanommer2' [log_config] version = 1