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

Koschei: Move away from deprecated fedmsg_env variable

Browse source
This commit is contained in:
Mikolaj Izdebski 2025-03-18 19:37:38 +01:00
parent fe0aa52569
commit 10789ceba2
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ config = {
"plugins": ['fedmsg'], "plugins": ['fedmsg'],
{% endif %} {% endif %}
"fedmsg": { "fedmsg": {
"topic": "org.fedoraproject.{{ fedmsg_env }}.buildsys", "topic": "{{ koschei_topic_prefix }}.buildsys",
}, },
"fedmsg-publisher": { "fedmsg-publisher": {
"enabled": True, "enabled": True,
@ -139,7 +139,7 @@ config = {
"config_path": "/etc/koschei/copr-config", "config_path": "/etc/koschei/copr-config",
"overriding_by_exclusions": False, "overriding_by_exclusions": False,
"max_builds": 2, "max_builds": 2,
"fedmsg_topic": "org.fedoraproject.{{ fedmsg_env }}.copr.build.end", "fedmsg_topic": "{{ koschei_topic_prefix }}.copr.build.end",
"default_schedule_count": 8, "default_schedule_count": 8,
"name_prefix": "k", "name_prefix": "k",
"require_admin": True, "require_admin": True,

6
roles/openshift-apps/koschei/templates/fedora-messaging.toml.j2
View file

@ -1,5 +1,5 @@
amqp_url = "amqps://koschei{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" amqp_url = "amqps://koschei{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
topic_prefix = "org.fedoraproject.{{ fedmsg_env }}" topic_prefix = "{{ koschei_topic_prefix }}"
passive_declares = true passive_declares = true
[tls] [tls]
@ -23,6 +23,6 @@ arguments = {}
queue = "koschei{{ env_suffix }}" queue = "koschei{{ env_suffix }}"
exchange = "amq.topic" exchange = "amq.topic"
routing_keys = [ routing_keys = [
"org.fedoraproject.{{ fedmsg_env }}.buildsys.tag", "{{ koschei_topic_prefix }}.buildsys.tag",
"org.fedoraproject.{{ fedmsg_env }}.buildsys.task.state.change", "{{ koschei_topic_prefix }}.buildsys.task.state.change",
] ]

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

@ -25,6 +25,8 @@ koschei_pgsql_admin_password: "{{ koscheiadmin_db_password }}"
koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_prod }}" koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_prod }}"
koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_prod }}" koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_prod }}"
koschei_topic_prefix: org.fedoraproject.prod
koschei_frontend_replicas: 3 koschei_frontend_replicas: 3
koschei_backend_services: koschei_backend_services:

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

@ -25,6 +25,8 @@ koschei_pgsql_admin_password: "{{ koscheiadmin_stg_db_password }}"
koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_stg }}" koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_stg }}"
koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_stg }}" koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_stg }}"
koschei_topic_prefix: org.fedoraproject.stg
koschei_frontend_replicas: 2 koschei_frontend_replicas: 2
koschei_backend_services: koschei_backend_services: