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

Factor the hostname of the datanommer server in staging and prod

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2024-04-25 17:08:58 +02:00
parent 4fc54a4d88
commit 894ba795f8
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
7 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/all
View file

@ -88,6 +88,8 @@ datacenter: iad2
#wsgi_procs: 4
#wsgi_threads: 4
# Datanommer
datanommer_db_hostname: db-datanommer02
# By default, nodes don't backup any dbs on them unless they declare it.
dbs_to_backup: []
# dnf-automatic-install.service mode default: security-only

1
inventory/group_vars/staging
View file

@ -1,4 +1,5 @@
---
datanommer_db_hostname: db-datanommer01
deployment_type: stg
dns_search1: "stg.iad2.fedoraproject.org"
dns_search2: "iad2.fedoraproject.org"

4
roles/badges/backend/templates/datanommer.py
View file

@ -1,7 +1,7 @@
config = {
{% if env == "staging" %}
'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommer_stg_db_password}}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer2',
'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommer_stg_db_password}}@{{datanommer_db_hostname}}.stg.iad2.fedoraproject.org/datanommer2',
{% else %}
'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer02/datanommer2',
'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@{{datanommer_db_hostname}}/datanommer2',
{% endif %}
}

2
roles/openshift-apps/badges/templates/fm-fedbadges.toml
View file

@ -58,7 +58,7 @@ consume_delay = 1
database_uri = "postgresql://{{ tahrirDBUser }}:{{ (env == 'production')|ternary(tahrirDBPassword, tahrirstgDBPassword) }}@{{ badges_db_host }}/{{ badges_db_name }}"
# Datanommer database URI
datanommer_db_uri = "postgresql://{{ tahrirDBUser }}:{{ (env == 'production')|ternary(tahrirDBPassword, tahrirstgDBPassword) }}@db-datanommer{{ (env == 'production')|ternary('02', '01') }}{{ env_suffix }}/datanommer2"
datanommer_db_uri = "postgresql://{{ tahrirDBUser }}:{{ (env == 'production')|ternary(tahrirDBPassword, tahrirstgDBPassword) }}@{{ datanommer_db_hostname }}{{ env_suffix }}/datanommer2"
datagrepper_url = "https://apps{{ env_suffix }}.fedoraproject.org/datagrepper"
distgit_hostname = "src{{ env_suffix }}.fedoraproject.org"
id_provider_hostname = "id{{ env_suffix }}.fedoraproject.org"

2
roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py
View file

@ -4,7 +4,7 @@
APP_PATH = "https://apps{{ env_suffix }}.fedoraproject.org/datagrepper"
DEFAULT_QUERY_DELTA = 86400
DATANOMMER_SQLALCHEMY_URL = "postgresql://datagrepper:{{ (env == 'production')|ternary(datagrepper_prod_db_password, datagrepper_stg_db_password) }}@db-datanommer{{ (env == 'production')|ternary('02', '01') }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2"
DATANOMMER_SQLALCHEMY_URL = "postgresql://datagrepper:{{ (env == 'production')|ternary(datagrepper_prod_db_password, datagrepper_stg_db_password) }}@{{ datanommer_db_hostname }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2"
# Only allow ajax/websockets connections back to our domains.
# https://github.com/fedora-infra/datagrepper/pull/192

2
roles/openshift-apps/datanommer/templates/alembic.ini
View file

@ -2,7 +2,7 @@
# path to migration scripts
script_location = datanommer.models:alembic
# database url
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
sqlalchemy.url = postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@{{ datanommer_db_hostname }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2
# Logging configuration
[loggers]

2
roles/openshift-apps/datanommer/templates/fedora-messaging-config.toml
View file

@ -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-datanommer{{ (env == 'production')|ternary('02', '01') }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2'
datanommer_sqlalchemy_url = 'postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@{{ datanommer_db_hostname }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2'
alembic_ini = "/etc/fedora-messaging/alembic.ini"
[log_config]