From b402aedb723c5dd87e2058023b27fada4643a95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Fri, 27 Jun 2025 15:33:13 +0200 Subject: [PATCH] Remove some references to iad2 in bodhi-backend's playbook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/bodhi2/base/tasks/main.yml | 13 ++++++------- roles/bodhi2/base/templates/configmap.yml.j2 | 2 +- roles/bodhi2/base/templates/production.ini.j2 | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 8c2a90fa20..b419ba8142 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -38,7 +38,7 @@ - name: Configure the bodhi virtual host run_once: true - delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" + delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_vhost: name: /bodhi state: present @@ -49,7 +49,7 @@ - name: Configure the HA policy for the bodhi queues run_once: true - delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" + delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_policy: name: HA apply_to: queues @@ -66,7 +66,7 @@ - name: Grant the admin user access to the bodhi vhost run_once: true - delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" + delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_user: user: admin vhost: /bodhi @@ -81,7 +81,7 @@ - name: Grant the nagios-monitoring user access to the bodhi vhost run_once: true - delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" + delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_user: user: nagios-monitoring vhost: /bodhi @@ -112,7 +112,7 @@ - name: Grant the bodhi user access to the bodhi vhost run_once: true - delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" + delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_user: user: "bodhi{{ env_suffix }}" vhost: /bodhi @@ -132,8 +132,7 @@ - name: Add a policy to remove after a week of no use for /bodhi run_once: true - delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org" - with_items: "{{ datacenter }}" + delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_policy: apply_to: queues name: bodhi_sweeper diff --git a/roles/bodhi2/base/templates/configmap.yml.j2 b/roles/bodhi2/base/templates/configmap.yml.j2 index 86ef812801..b6e3c0ce79 100644 --- a/roles/bodhi2/base/templates/configmap.yml.j2 +++ b/roles/bodhi2/base/templates/configmap.yml.j2 @@ -29,7 +29,7 @@ data: .fedoraproject.org = FEDORAPROJECT.ORG fedoraproject.org = FEDORAPROJECT.ORG {% if env == "staging" %} - .stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG + .stg.{{ datacenter }}.fedoraproject.org = STG.FEDORAPROJECT.ORG {% endif %} .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG stg.fedoraproject.org = STG.FEDORAPROJECT.ORG diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 4be1162919..80a299bd9b 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -344,7 +344,7 @@ fedora_epel_test_announce_list = epel-devel@lists.fedoraproject.org admin_groups = proventesters security_respons bodhiadmin sysadmin-main bodhi_update_bots # Users that we don't want to show up in the "leaderboard(s)" -stats_blacklist = bodhi anonymous autoqa taskotron bpeck/jenkins-continuous-infra.apps.ci.centos.org packagerbot/os-control01.iad2.fedoraproject.org distrobuildsync-eln/jenkins-continuous-infra.apps.ci.centos.org +stats_blacklist = bodhi anonymous autoqa taskotron bpeck/jenkins-continuous-infra.apps.ci.centos.org packagerbot/os-control01.{{ datacenter }}.fedoraproject.org distrobuildsync-eln/jenkins-continuous-infra.apps.ci.centos.org # A list of non-person users # system_users = bodhi @@ -704,9 +704,9 @@ debugtoolbar.hosts = 127.0.0.1 ::1 # example, postgresql://username:password@hostname/database_name # sqlalchemy.url = sqlite:////var/cache/bodhi.db {% if env == 'production' %} -sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.iad2.fedoraproject.org/bodhi2 +sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.{{ datacenter }}.fedoraproject.org/bodhi2 {% elif env == 'staging' %} -sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db01.stg.iad2.fedoraproject.org/bodhi2 +sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db01.stg.{{ datacenter }}.fedoraproject.org/bodhi2 {% endif %} # sqlalchemy_extra.statement_timeout = 30000