From a2469896a5abb9dbf72e4559d16fa893efe96ddf Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 16 Nov 2020 16:42:25 -0800 Subject: [PATCH] datagrepper/datanommer: fix old phx2 uri's in staging Signed-off-by: Kevin Fenzi --- roles/datagrepper/templates/datagrepper-fedmsg.py | 8 ++------ roles/datagrepper/templates/datagrepper.cfg | 13 +++---------- roles/fedmsg/datanommer/templates/alembic.ini | 4 ++-- roles/fedmsg/datanommer/templates/datanommer.py | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/roles/datagrepper/templates/datagrepper-fedmsg.py b/roles/datagrepper/templates/datagrepper-fedmsg.py index 321722d6f3..ff3a45e3ad 100644 --- a/roles/datagrepper/templates/datagrepper-fedmsg.py +++ b/roles/datagrepper/templates/datagrepper-fedmsg.py @@ -9,14 +9,10 @@ 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-datanommer.stg.phx2.fedoraproject.org/datanommer', + 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@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', - {% elif datacenter == 'phx2' %} - 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer02.phx2.fedoraproject.org/datanommer', - 'fedmenu_url': 'https://apps.fedoraproject.org/fedmenu', - 'fedmenu_data_url': 'https://apps.fedoraproject.org/js/data.js', - {% elif datacenter == 'iad2' %} + {% else %} 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.iad2.fedoraproject.org/datanommer', 'fedmenu_url': 'https://apps.fedoraproject.org/fedmenu', 'fedmenu_data_url': 'https://apps.fedoraproject.org/js/data.js', diff --git a/roles/datagrepper/templates/datagrepper.cfg b/roles/datagrepper/templates/datagrepper.cfg index b28c8ba707..1e16528043 100644 --- a/roles/datagrepper/templates/datagrepper.cfg +++ b/roles/datagrepper/templates/datagrepper.cfg @@ -13,19 +13,12 @@ DATAGREPPER_BASE_URL='https://apps.fedoraproject.org/datagrepper/' {% endif %} DATAGREPPER_CACHE_BACKEND='dogpile.cache.memcached' -{% if env == "staging" %} DATAGREPPER_CACHE_KWARGS={'arguments': {'url': 'memcached01:11211'}} -{% else %} -#DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211', 'memcached02.phx2.fedoraproject.org:11211']}} -DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211']}} -{% endif %} {% if env == "staging" %} -SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db-datanommer.stg.phx2.fedoraproject.org:5432/datagrepper' -{% elif datacenter == 'phx2' %} -SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db01.phx2.fedoraproject.org:5432/datagrepper' -{% elif datacenter == 'iad2' %} -SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db01.iad2.fedoraproject.org:5432/datagrepper' +SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db-datanommer01.stg.iad2.fedoraproject.org:5432/datagrepper' +{% else %} +SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db-datanommer01.iad2.fedoraproject.org:5432/datagrepper' {% endif %} {% if env == "staging" %} diff --git a/roles/fedmsg/datanommer/templates/alembic.ini b/roles/fedmsg/datanommer/templates/alembic.ini index 1025e4b922..8257e005d0 100644 --- a/roles/fedmsg/datanommer/templates/alembic.ini +++ b/roles/fedmsg/datanommer/templates/alembic.ini @@ -10,9 +10,9 @@ script_location = /usr/share/datanommer.models/alembic/ # revision_environment = false {% if env == "production" %} -sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer02/datanommer +sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01/datanommer {% else %} -sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer.stg.phx2.fedoraproject.org/datanommer +sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@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 cae39bdcba..44feee076b 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-datanommer.stg.phx2.fedoraproject.org/datanommer', + 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer', {% endif %} }