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

Prefix ODCS koji profiles with 'odcs_'

Browse source
This commit is contained in:
Jan Kaluža 2018-01-05 11:37:17 +00:00
parent 99e5c3a775
commit 25e41c0adc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/odcs/backend/templates/etc/koji.conf.d/odcs.conf.j2
View file

@ -1,11 +1,11 @@
[production] [odcs_production]
server = https://koji.fedoraproject.org/kojihub server = https://koji.fedoraproject.org/kojihub
weburl = https://koji.fedoraproject.org/koji weburl = https://koji.fedoraproject.org/koji
topurl = https://kojipkgs.fedoraproject.org/ topurl = https://kojipkgs.fedoraproject.org/
authtype = kerberos authtype = kerberos
krb_rdns = false krb_rdns = false
[stg] [odcs_stg]
server = https://koji.stg.fedoraproject.org/kojihub server = https://koji.stg.fedoraproject.org/kojihub
weburl = https://koji.stg.fedoraproject.org/koji weburl = https://koji.stg.fedoraproject.org/koji
topurl = https://kojipkgs.stg.fedoraproject.org/ topurl = https://kojipkgs.stg.fedoraproject.org/

4
roles/odcs/base/templates/etc/odcs/config.py.j2
View file

@ -72,7 +72,7 @@ class ProdConfiguration(BaseConfiguration):
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://odcs:{{odcs_stg_db_password}}@db-odcs/odcs{{ '?sslmode=require' if odcs_force_postgres_ssl else '' }}' SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://odcs:{{odcs_stg_db_password}}@db-odcs/odcs{{ '?sslmode=require' if odcs_force_postgres_ssl else '' }}'
KOJI_PROFILE = 'stg' KOJI_PROFILE = 'odcs_stg'
PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1' PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1'
@ -84,7 +84,7 @@ class ProdConfiguration(BaseConfiguration):
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://odcs:{{odcs_prod_db_password}}@db-odcs/odcs{{ '?sslmode=require' if odcs_force_postgres_ssl else '' }}' SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://odcs:{{odcs_prod_db_password}}@db-odcs/odcs{{ '?sslmode=require' if odcs_force_postgres_ssl else '' }}'
KOJI_PROFILE = 'production' KOJI_PROFILE = 'odcs_production'
PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1' PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'