infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Koschei: fix mixed staging/prod db passwords

Browse source
This commit is contained in:
Mikolaj Izdebski 2023-02-13 08:58:12 +01:00
parent 34a70319ca
commit cbfa7d32e2
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/openshift-apps/koschei/templates/config-admin.cfg.j2
View file

@ -5,12 +5,8 @@
config = {
"database_config": {
"username": "koscheiadmin",
{% if env == 'staging' %}
"password": "{{ koscheiadmin_db_password }}",
{% else %}
"password": "{{ koscheiadmin_stg_db_password }}",
{% endif %}
"username": "{{ koschei_pgsql_admin_username }}",
"password": "{{ koschei_pgsql_admin_password }}",
},
}

8
roles/openshift-apps/koschei/templates/config-backend.cfg.j2
View file

@ -6,12 +6,8 @@
config = {
"database_config": {
"host": "{{ koschei_pgsql_hostname }}",
"username": "koscheiuser",
{% if env == 'staging' %}
"password": "{{ koscheiuser_stg_db_password }}",
{% else %}
"password": "{{ koscheiuser_db_password }}",
{% endif %}
"username": "{{ koschei_pgsql_username }}",
"password": "{{ koschei_pgsql_password }}",
"database": "koschei"
},
"koji_config": {

8
roles/openshift-apps/koschei/templates/config-frontend.cfg.j2
View file

@ -5,12 +5,8 @@
config = {
"database_config": {
"host": "{{ koschei_pgsql_hostname }}",
"username": "koscheiuser",
{% if env == 'staging' %}
"password": "{{ koscheiuser_stg_db_password }}",
{% else %}
"password": "{{ koscheiuser_db_password }}",
{% endif %}
"username": "{{ koschei_pgsql_username }}",
"password": "{{ koschei_pgsql_password }}",
"database": "koschei"
},
"koji_config": {

5
roles/openshift-apps/koschei/vars/production.yml
View file

@ -11,6 +11,11 @@ koschei_koji_web: koji.fedoraproject.org
koschei_oidc_provider: id.fedoraproject.org
koschei_bugzilla: bugzilla.redhat.com
koschei_pgsql_username: koscheiuser
koschei_pgsql_password: "{{ koscheiuser_db_password }}"
koschei_pgsql_admin_username: koscheiadmin
koschei_pgsql_admin_password: "{{ koscheiadmin_db_password }}"
koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_prod }}"
koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_prod }}"

5
roles/openshift-apps/koschei/vars/staging.yml
View file

@ -11,6 +11,11 @@ koschei_koji_web: koji.stg.fedoraproject.org
koschei_oidc_provider: id.stg.fedoraproject.org
koschei_bugzilla: bugzilla5.redhat.com
koschei_pgsql_username: koscheiuser
koschei_pgsql_password: "{{ koscheiuser_stg_db_password }}"
koschei_pgsql_admin_username: koscheiadmin
koschei_pgsql_admin_password: "{{ koscheiadmin_stg_db_password }}"
koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_stg }}"
koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_stg }}"