Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

datagrepper/datanommer: fix old phx2 uri's in staging

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-11-16 16:42:25 -08:00
parent bcb29a60c4
commit a2469896a5
4 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/datagrepper/templates/datagrepper-fedmsg.py
View file

@ -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',

13
roles/datagrepper/templates/datagrepper.cfg
View file

@ -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" %}

4
roles/fedmsg/datanommer/templates/alembic.ini
View file

@ -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/

2
roles/fedmsg/datanommer/templates/datanommer.py
View file

@ -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 %}
}