WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-05-12 02:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace references to iad2 with the datacenter variable in openshift apps

Browse Source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard
2025-06-27 12:25:21 +02:00
parent 61e452a93b
commit bc4fac90cb
30 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/openshift-apps/badges/templates/tahrir.cfg.py
View File

@@ -14,7 +14,7 @@ SESSION_COOKIE_HTTPONLY = True
SESSION_COOKIE_SECURE = True
{% if env == 'staging' %}
SQLALCHEMY_DATABASE_URI = "postgresql://{{tahrirDBUser}}:{{tahrirstgDBPassword}}@db01.stg.iad2.fedoraproject.org/tahrir"
SQLALCHEMY_DATABASE_URI = "postgresql://{{tahrirDBUser}}:{{tahrirstgDBPassword}}@db01.stg.{{datacenter}}.fedoraproject.org/tahrir"
TAHRIR_TITLE = "Fedora Badges (staging!)"
{% else %}
SQLALCHEMY_DATABASE_URI = "postgresql://{{tahrirDBUser}}:{{tahrirDBPassword}}@db-tahrir/tahrir"

4
roles/openshift-apps/blockerbugs/templates/cron.yml.j2
View File

@@ -29,7 +29,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "blockerbugs"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
{% if env == 'staging' %}
@@ -97,4 +97,4 @@ spec:
volumes:
- name: blockerbugs-secret-volume
secret:
secretName: blockerbugs-secret
secretName: blockerbugs-secret

2
roles/openshift-apps/blockerbugs/templates/deployment.yml.j2
View File

@@ -38,7 +38,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "blockerbugs"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
{% if env == 'staging' %}

2
roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml.j2
View File

@@ -47,7 +47,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "blockerbugs"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
{% if env == 'staging' %}

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

4
roles/openshift-apps/elections/templates/alembic.ini
View File

@@ -12,9 +12,9 @@ script_location = /opt/app-root/src/alembic
# revision_environment = false
{% if env == 'staging' %}
sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable
sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01.stg.{{datacenter}}.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable
{% else %}
sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable
sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.{{datacenter}}.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable
{% endif %}

4
roles/openshift-apps/elections/templates/fedora-elections.cfg
View File

@@ -10,9 +10,9 @@ APPLICATION_ROOT = '/'
### url to the database server:
{% if env == 'staging' %}
DB_URL='postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01{{ env_suffix }}.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable'
DB_URL='postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable'
{% else %}
DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01{{ env_suffix }}.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable'
DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable'
{% endif %}
## One ore more FAS group that will have admin rights over the whole

4
roles/openshift-apps/fedocal/templates/alembic.ini
View File

@@ -13,9 +13,9 @@ script_location = /opt/app-root/src/alembic
#sqlalchemy.url = postgresql://<%= fedocal_app %>:<%= fedocal_appPassword %>@db-fedocal/fedocal
{% if env == 'staging' %}
sqlalchemy.url = postgresql://{{ fedocal_db_user }}:{{ fedocal_stg_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ fedocal_db_name }}
sqlalchemy.url = postgresql://{{ fedocal_db_user }}:{{ fedocal_stg_db_pass }}@db01.stg.{{datacenter}}.fedoraproject.org/{{ fedocal_db_name }}
{% else %}
sqlalchemy.url = postgresql://{{ fedocal_db_user }}:{{ fedocal_db_pass }}@db01.iad2.fedoraproject.org/{{ fedocal_db_name }}
sqlalchemy.url = postgresql://{{ fedocal_db_user }}:{{ fedocal_db_pass }}@db01.{{datacenter}}.fedoraproject.org/{{ fedocal_db_name }}
{% endif %}

4
roles/openshift-apps/fedocal/templates/fedocal.cfg
View File

@@ -8,9 +8,9 @@ SECRET_KEY='{{ fedocal_secret_key }}'
#DB_URL=postgres://user:pass@host/db_name
#DB_URL="postgresql://<%= fedocal_app %>:<%= fedocal_appPassword %>@db-fedocal/fedocal"
{% if env == 'staging' %}
DB_URL='postgresql://{{ fedocal_db_user }}:{{ fedocal_stg_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ fedocal_db_name }}'
DB_URL='postgresql://{{ fedocal_db_user }}:{{ fedocal_stg_db_pass }}@db01.stg.{{datacenter}}.fedoraproject.org/{{ fedocal_db_name }}'
{% else %}
DB_URL='postgresql://{{ fedocal_db_user }}:{{ fedocal_db_pass }}@db01.iad2.fedoraproject.org/{{ fedocal_db_name }}'
DB_URL='postgresql://{{ fedocal_db_user }}:{{ fedocal_db_pass }}@db01.{{datacenter}}.fedoraproject.org/{{ fedocal_db_name }}'
{% endif %}

2
roles/openshift-apps/fmn/templates/fmn.cfg
View File

@@ -2,7 +2,7 @@
# FMN configuration (fmn.core.config)
#
DATABASE__SQLALCHEMY__URL="postgresql://fmn:{{ (env == 'production')|ternary(fmn_prod_db_password, fmn_stg_db_password) }}@db01{{ env_suffix }}.iad2.fedoraproject.org/fmn"
DATABASE__SQLALCHEMY__URL="postgresql://fmn:{{ (env == 'production')|ternary(fmn_prod_db_password, fmn_stg_db_password) }}@db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org/fmn"
CORS_ORIGINS="https://notifications{{ env_suffix }}.fedoraproject.org"
OIDC_PROVIDER_URL="https://id{{ env_suffix }}.fedoraproject.org/openidc"
OIDC_CONF_ENDPOINT="/.well-known/openid-configuration"

2
roles/openshift-apps/kanban/templates/envvars.jinja
View File

@@ -11,6 +11,6 @@
- name: DB_PASSWORD
value: "{{ (env == 'production')|ternary(kanban_db_pass, kanban_db_pass_stg) }}"
- name: DB_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: DB_PORT
value: "5432"

2
roles/openshift-apps/koschei/vars/production.yml
View File

@@ -5,7 +5,7 @@ project_appowners:
koschei_container_image: quay.io/koschei/koschei:fedora-prod
koschei_topurl: https://koschei.fedoraproject.org
koschei_pgsql_hostname: db01.iad2.fedoraproject.org
koschei_pgsql_hostname: db01.{{datacenter}}.fedoraproject.org
koschei_koji_hub: koji.fedoraproject.org
koschei_kojipkgs: kojipkgs.fedoraproject.org
koschei_koji_web: koji.fedoraproject.org

2
roles/openshift-apps/koschei/vars/staging.yml
View File

@@ -5,7 +5,7 @@ project_appowners:
koschei_container_image: quay.io/koschei/koschei:fedora-stage
koschei_topurl: https://koschei.stg.fedoraproject.org
koschei_pgsql_hostname: db01.stg.iad2.fedoraproject.org
koschei_pgsql_hostname: db01.stg.{{datacenter}}.fedoraproject.org
koschei_koji_hub: koji.stg.fedoraproject.org
koschei_kojipkgs: koji.stg.fedoraproject.org
koschei_koji_web: koji.stg.fedoraproject.org

2
roles/openshift-apps/maubot/templates/config.yml.j2
View File

@@ -1,5 +1,5 @@
---
database: postgresql://maubot:{{ (env == 'production')|ternary(maubot_prod_db_password, maubot_stg_db_password) }}@db01{{ env_suffix }}.iad2.fedoraproject.org/maubot
database: postgresql://maubot:{{ (env == 'production')|ternary(maubot_prod_db_password, maubot_stg_db_password) }}@db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org/maubot
crypto_database: default

4
roles/openshift-apps/mdapi/templates/mdapi.cfg
View File

@@ -3,8 +3,8 @@ PORT = '8080'
DL_VERIFY = False
{% if env == 'staging' %}
KOJI_REPO = 'https://koji.stg.fedoraproject.org/repos/'
DL_SERVER = 'http://dl.iad2.fedoraproject.org'
DL_SERVER = 'http://dl.{{datacenter}}.fedoraproject.org'
{% else %}
KOJI_REPO = 'https://koji.fedoraproject.org/repos/'
DL_SERVER = 'http://dl.iad2.fedoraproject.org'
DL_SERVER = 'http://dl.{{datacenter}}.fedoraproject.org'
{% endif %}

6
roles/openshift-apps/mirrormanager/files/storage.yml
View File

@@ -54,7 +54,7 @@ spec:
accessModes:
- ReadOnlyMany
nfs:
server: ntap-iad2-c02-fedora01-nfs01a
server: ntap-rdu3-c02-fedora01-nfs01a
path: /fedora_ftp/fedora.redhat.com/pub
persistentVolumeReclaimPolicy: Retain
---
@@ -68,7 +68,7 @@ spec:
accessModes:
- ReadOnlyMany
nfs:
server: ntap-iad2-c02-fedora01-nfs01a
server: ntap-rdu3-c02-fedora01-nfs01a
path: /fedora_ftp_archive
persistentVolumeReclaimPolicy: Retain
---
@@ -82,7 +82,7 @@ spec:
accessModes:
- ReadOnlyMany
nfs:
server: ntap-iad2-c02-fedora01-nfs01a
server: ntap-rdu3-c02-fedora01-nfs01a
path: /openshift_prod_codecs
persistentVolumeReclaimPolicy: Retain
---

4
roles/openshift-apps/mirrormanager/templates/ssh_known_hosts
View File

@@ -1,2 +1,2 @@
@cert-authority *.fedoraproject.org,*.iad2.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org
@cert-authority *.stg.s390.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.iad2.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org
@cert-authority *.fedoraproject.org,*.rdu3.fedoraproject.org,*.iad2.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org
@cert-authority *.stg.s390.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.rdu3.fedoraproject.org,*.stg.iad2.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org

4
roles/openshift-apps/openscanhub/templates/etc-resallocserver-server.yaml.j2
View File

@@ -7,9 +7,9 @@
#db_url: 'postgresql://resalloc@/resalloc'
#For PostgreSQL listening on host/port, using password.
{% if env == 'staging' %}
db_url: 'postgresql://openscanhub_resalloc:{{ openscanhub_resalloc_db_password_stg }}@db01.stg.iad2.fedoraproject.org:5432/openscanhub_resalloc'
db_url: 'postgresql://openscanhub_resalloc:{{ openscanhub_resalloc_db_password_stg }}@db01.stg.{{datacenter}}.fedoraproject.org:5432/openscanhub_resalloc'
{% else %}
db_url: 'postgresql://openscanhub_resalloc:{{ openscanhub_resalloc_db_password }}@db01.iad2.fedoraproject.org:5432/openscanhub_resalloc'
db_url: 'postgresql://openscanhub_resalloc:{{ openscanhub_resalloc_db_password }}@db01.{{datacenter}}.fedoraproject.org:5432/openscanhub_resalloc'
{% endif %}
#db_url: 'sqlite:////var/lib/resallocserver/db.sqlite'

4
roles/openshift-apps/openscanhub/templates/settings_local.py
View File

@@ -23,10 +23,10 @@ DATABASES = {
'USER': 'openscanhub',
{% if env == 'staging' %}
'PASSWORD': '{{ openscanhub_db_password_stg }}',
'HOST': 'db01.stg.iad2.fedoraproject.org',
'HOST': 'db01.stg.{{datacenter}}.fedoraproject.org',
{% else %}
'PASSWORD': '{{ openscanhub_db_password }}',
'HOST': 'db01.iad2.fedoraproject.org',
'HOST': 'db01.{{datacenter}}.fedoraproject.org',
{% endif %}
'PORT': '5432',
},

16
roles/openshift-apps/oraculum/templates/deployment.yml.j2
View File

@@ -36,7 +36,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -63,7 +63,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:
@@ -127,7 +127,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -154,7 +154,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:
@@ -202,7 +202,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -229,7 +229,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:
@@ -279,7 +279,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -306,7 +306,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:

16
roles/openshift-apps/oraculum/templates/deploymentconfig.yml.j2
View File

@@ -45,7 +45,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -72,7 +72,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:
@@ -142,7 +142,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -169,7 +169,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:
@@ -223,7 +223,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -250,7 +250,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:
@@ -306,7 +306,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ oraculum_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
# Redis
@@ -333,7 +333,7 @@ spec:
- name: ADMIN_EMAILS
value: "fzatlouk@redhat.com"
- name: SMTP_CONFIG
value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
value: "bastion.{{datacenter}}.fedoraproject.org;;;watchdog@packager-dashboard{{ env_suffix }}.fedoraproject.org;"
- name: BZ_API_KEY
value: "{{ oraculum_bz_api_key }}"
volumeMounts:

4
roles/openshift-apps/poddlers/templates/fedora-messaging.toml
View File

@@ -123,10 +123,10 @@ lookaside_url = "https://src.fedoraproject.org/lookaside"
# Credentials for koji session
{% if env == 'staging' %}
principal = "toddlers/os-control01.stg.iad2.fedoraproject.org@STG.FEDORAPROJECT.ORG"
principal = "toddlers/os-control01.stg.{{datacenter}}.fedoraproject.org@STG.FEDORAPROJECT.ORG"
keytab = "/etc/keytabs/service.keytab"
{% else %}
principal = "toddlers/os-control01.iad2.fedoraproject.org@FEDORAPROJECT.ORG"
principal = "toddlers/os-control01.{{datacenter}}.fedoraproject.org@FEDORAPROJECT.ORG"
keytab = "/etc/keytabs/service.keytab"
{% endif %}

6
roles/openshift-apps/testdays/templates/deployment.yml.j2
View File

@@ -35,7 +35,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ testdays_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
- name: DB_DRIVER
@@ -47,7 +47,7 @@ spec:
- name: DB_DATABASE
value: "{{ testdays_db_name }}"
- name: DB_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: DB_PORT
value: "5432"
- name: SECRET_KEY
@@ -115,7 +115,7 @@ spec:
- name: POSTGRESQL_DATABASE
value: "{{ resultsdb_testdays_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
- name: SECRET_KEY

2
roles/openshift-apps/the-new-hotness/templates/krb5.conf
View File

@@ -22,7 +22,7 @@ kdc = https://id{{ env_suffix }}.fedoraproject.org/KdcProxy
.fedoraproject.org = FEDORAPROJECT.ORG
fedoraproject.org = FEDORAPROJECT.ORG
{% if env == "staging" %}
.stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG
.stg.rdu3.fedoraproject.org = STG.FEDORAPROJECT.ORG
{% endif %}
.stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
stg.fedoraproject.org = STG.FEDORAPROJECT.ORG

4
roles/openshift-apps/transtats/templates/secret.yml.j2
View File

@@ -15,7 +15,7 @@ stringData:
oidc_url: "id{{env_suffix}}.fedoraproject.org"
oidc-client-id: "{{transtats_stg_oidc_id}}"
oidc-client-secret: "{{transtats_stg_oidc_secret}}"
database-host: db01.stg.iad2.fedoraproject.org
database-host: db01.stg.{{datacenter}}.fedoraproject.org
database-user: transtats
{% endif %}
{% if env == 'production' %}
@@ -27,6 +27,6 @@ stringData:
oidc_url: "id{{env_suffix}}.fedoraproject.org"
oidc-client-id: "{{transtats_oidc_id}}"
oidc-client-secret: "{{transtats_oidc_secret}}"
database-host: db01.iad2.fedoraproject.org
database-host: db01.{{datacenter}}.fedoraproject.org
database-user: transtats
{% endif %}

4
roles/openshift-apps/waiverdb/templates/settings.py
View File

@@ -1,11 +1,11 @@
{% if env == 'staging' %}
DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.iad2.fedoraproject.org:5432/waiverdb'
DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.{{datacenter}}.fedoraproject.org:5432/waiverdb'
RESULTSDB_API_URL = 'https://resultsdb.stg.fedoraproject.org/api/v2.0'
CORS_URL = 'https://bodhi.stg.fedoraproject.org'
OVERWRITE_REDIRECT_URI = 'https://waiverdb.stg.fedoraproject.org/oidc_callback'
OIDC_REQUIRED_SCOPE = 'https://waiverdb.stg.fedoraproject.org/oidc/create-waiver'
{% else %}
DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.iad2.fedoraproject.org:5432/waiverdb'
DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.{{datacenter}}.fedoraproject.org:5432/waiverdb'
RESULTSDB_API_URL = 'https://resultsdb.fedoraproject.org/api/v2.0'
CORS_URL = 'https://bodhi.fedoraproject.org'
OVERWRITE_REDIRECT_URI = 'https://waiverdb.fedoraproject.org/oidc_callback'

2
roles/openshift-apps/webhook2fedmsg/templates/w2fm.cfg.j2
View File

@@ -1,4 +1,4 @@
DATABASE__SQLALCHEMY__URL="postgresql://webhook2fedmsg:{{ (env == 'staging')|ternary(webhook2fedmsg_stg_db_password, webhook2fedmsg_prod_db_password) }}@db01{{ env_suffix }}.iad2.fedoraproject.org/webhook2fedmsg"
DATABASE__SQLALCHEMY__URL="postgresql://webhook2fedmsg:{{ (env == 'staging')|ternary(webhook2fedmsg_stg_db_password, webhook2fedmsg_prod_db_password) }}@db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org/webhook2fedmsg"
SESSION_SECRET="{{ (env == 'staging')|ternary(webhook2fedmsg_stg_secret_key, webhook2fedmsg_prod_secret_key) }}"
FASJSON_URL="https://fasjson{{ env_suffix }}.fedoraproject.org"
OIDC__PROVIDER_URL="https://id{{ env_suffix }}.fedoraproject.org/openidc"

2
roles/openshift-apps/zezere/templates/deploymentconfig.yml.j2
View File

@@ -61,7 +61,7 @@ spec:
- name: DATABASE_engine
value: "django.db.backends.postgresql_psycopg2"
- name: DATABASE_host
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"
- name: DATABASE_name
value: "zezere"
- name: DATABASE_user