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

Don't put so much public stuff in the ansible repo, where we don't have env variables

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2025-06-30 09:44:57 +02:00
parent 2f22b5edea
commit 5203378066
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
11 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/openshift-apps/kerneltest.yml
View file

@ -8,6 +8,7 @@
- /srv/web/infra/ansible/vars/global.yml
- /srv/private/ansible/vars.yml
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- /srv/web/infra/ansible/vars/apps/kerneltest.yml
tasks:
- name: Kerneltest DB user
@ -30,6 +31,7 @@
- /srv/web/infra/ansible/vars/global.yml
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- /srv/web/infra/ansible/vars/apps/kerneltest.yml
pre_tasks:
- name: Include Global Variables

1
playbooks/openshift-apps/release-monitoring.yml
View file

@ -9,6 +9,7 @@
- /srv/web/infra/ansible/vars/global.yml
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- /srv/web/infra/ansible/vars/apps/release-monitoring.yml
roles:
- role: rabbit/user

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

@ -12,7 +12,7 @@ script_location = /opt/app-root/src/kerneltest/alembic
# revision_environment = false
{% if env == 'staging' %}
sqlalchemy.url = postgresql://{{ kerneltest_stg_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_stg_db_host }}/kerneltest
sqlalchemy.url = postgresql://{{ kerneltest_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_db_host }}/kerneltest
{% else %}
sqlalchemy.url = postgresql://{{ kerneltest_db_user }}:{{ kerneltest_db_pass }}@{{ kerneltest_db_host }}/kerneltest
{% endif %}

4
roles/openshift-apps/kerneltest/templates/config.toml
View file

@ -1,7 +1,7 @@
{% if env == 'staging' %}
SECRET_KEY = "{{ kerneltest_stg_secret_key }}"
API_KEY = "{{ kerneltest_stg_api_key }}"
DB_URL = "postgresql://{{ kerneltest_stg_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_stg_db_host }}/kerneltest"
DB_URL = "postgresql://{{ kerneltest_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_db_host }}/kerneltest"
{% else %}
SECRET_KEY = "{{ kerneltest_secret_key }}"
API_KEY = "{{ kerneltest_api_key }}"
@ -11,4 +11,4 @@ ADMIN_GROUP = ["sysadmin-kernel", "sysadmin-main"]
OIDC_CLIENT_SECRETS = "/etc/kerneltest-config/client_secrets.json"
OIDC_CALLBACK_ROUTE = '/oidc_callback'
LOG_DIR = '/srv/testlogs'
LOG_DIR = '/srv/testlogs'

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

@ -2,7 +2,7 @@
script_location = anitya:db/migrations
sourceless = false
{% if env == 'staging' %}
sqlalchemy.url = postgresql://{{ anitya_stg_db_admin_user }}:{{ anitya_stg_db_admin_pass }}@{{ anitya_stg_db_host }}/{{ anitya_stg_db_name }}
sqlalchemy.url = postgresql://{{ anitya_db_admin_user }}:{{ anitya_stg_db_admin_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}
{% else %}
sqlalchemy.url = postgresql://{{ anitya_db_admin_user }}:{{ anitya_db_admin_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}
{% endif %}

2
roles/openshift-apps/release-monitoring/templates/anitya.toml
View file

@ -14,7 +14,7 @@ preferred_url_scheme = "https"
permanent_session_lifetime = 604800
{% if env == 'staging' %}
db_url = "postgresql://{{ anitya_stg_db_user }}:{{ anitya_stg_db_pass }}@{{ anitya_stg_db_host }}/{{ anitya_stg_db_name }}"
db_url = "postgresql://{{ anitya_db_user }}:{{ anitya_stg_db_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}"
{% else %}
db_url = "postgresql://{{ anitya_db_user }}:{{ anitya_db_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}"
{% endif %}

4
roles/openshift-apps/resultsdb/templates/backend/imagestream.yml.j2
View file

@ -11,7 +11,7 @@ spec:
from:
kind: DockerImage
{% if env == 'staging' %}
name: "{{ stg_resultsdb_image }}"
name: "{{ resultsdb_image }}"
{% else %}
name: "{{ prod_resultsdb_image }}"
name: "{{ resultsdb_image }}"
{% endif %}

4
roles/openshift-apps/resultsdb/templates/backend/secrets.yml.j2
View file

@ -13,9 +13,9 @@ stringData:
SECRET_KEY = '{{ prod_resultsdb_secret_key }}'
{% endif %}
{% if env == 'staging' %}
SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ stg_resultsdb_db_user }}:{{ stg_resultsdb_db_password }}@{{ stg_resultsdb_db_host }}:{{ stg_resultsdb_db_port }}/{{ stg_resultsdb_db_name }}'
SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ resultsdb_db_user }}:{{ stg_resultsdb_db_password }}@{{ resultsdb_db_host }}:{{ resultsdb_db_port }}/{{ resultsdb_db_name }}'
{% else %}
SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ prod_resultsdb_db_user }}:{{ prod_resultsdb_db_password }}@{{ prod_resultsdb_db_host }}:{{ prod_resultsdb_db_port }}/{{ prod_resultsdb_db_name }}'
SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ resultsdb_db_user }}:{{ prod_resultsdb_db_password }}@{{ resultsdb_db_host }}:{{ resultsdb_db_port }}/{{ resultsdb_db_name }}'
{% endif %}
LOGGING = {
'version': 1,

3
vars/apps/kerneltest.yml Normal file
View file

@ -0,0 +1,3 @@
kerneltest_db_host: "db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
kerneltest_db_user: "kerneltestuser"
kerneltest_db_name: "kerneltest"

5
vars/apps/release-monitoring.yml Normal file
View file

@ -0,0 +1,5 @@
---
anitya_db_host: "db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
anitya_db_name: anitya
anitya_db_user: anitya
anitya_db_admin_user: anitya_admin

6
vars/apps/resultsdb.yml Normal file
View file

@ -0,0 +1,6 @@
---
resultsdb_db_user: "{{ (env == 'production')|ternary('prodresultsdbuser', 'stgresultsdb') }}"
resultsdb_db_host: db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org
resultsdb_db_port: 5432
resultsdb_db_name: resultsdb
resultsdb_image: "quay.io/fedora/resultsdb:latest"