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

Remove some references to iad2 in bodhi-backend's playbook

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2025-06-27 15:33:13 +02:00
parent 64cebd0d91
commit b402aedb72
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
roles/bodhi2/base/tasks/main.yml
View file

@ -38,7 +38,7 @@
- name: Configure the bodhi virtual host - name: Configure the bodhi virtual host
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
rabbitmq_vhost: rabbitmq_vhost:
name: /bodhi name: /bodhi
state: present state: present
@ -49,7 +49,7 @@
- name: Configure the HA policy for the bodhi queues - name: Configure the HA policy for the bodhi queues
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
rabbitmq_policy: rabbitmq_policy:
name: HA name: HA
apply_to: queues apply_to: queues
@ -66,7 +66,7 @@
- name: Grant the admin user access to the bodhi vhost - name: Grant the admin user access to the bodhi vhost
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
rabbitmq_user: rabbitmq_user:
user: admin user: admin
vhost: /bodhi vhost: /bodhi
@ -81,7 +81,7 @@
- name: Grant the nagios-monitoring user access to the bodhi vhost - name: Grant the nagios-monitoring user access to the bodhi vhost
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
rabbitmq_user: rabbitmq_user:
user: nagios-monitoring user: nagios-monitoring
vhost: /bodhi vhost: /bodhi
@ -112,7 +112,7 @@
- name: Grant the bodhi user access to the bodhi vhost - name: Grant the bodhi user access to the bodhi vhost
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
rabbitmq_user: rabbitmq_user:
user: "bodhi{{ env_suffix }}" user: "bodhi{{ env_suffix }}"
vhost: /bodhi vhost: /bodhi
@ -132,8 +132,7 @@
- name: Add a policy to remove after a week of no use for /bodhi - name: Add a policy to remove after a week of no use for /bodhi
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
with_items: "{{ datacenter }}"
rabbitmq_policy: rabbitmq_policy:
apply_to: queues apply_to: queues
name: bodhi_sweeper name: bodhi_sweeper

2
roles/bodhi2/base/templates/configmap.yml.j2
View file

@ -29,7 +29,7 @@ data:
.fedoraproject.org = FEDORAPROJECT.ORG .fedoraproject.org = FEDORAPROJECT.ORG
fedoraproject.org = FEDORAPROJECT.ORG fedoraproject.org = FEDORAPROJECT.ORG
{% if env == "staging" %} {% if env == "staging" %}
.stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG .stg.{{ datacenter }}.fedoraproject.org = STG.FEDORAPROJECT.ORG
{% endif %} {% endif %}
.stg.fedoraproject.org = STG.FEDORAPROJECT.ORG .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
stg.fedoraproject.org = STG.FEDORAPROJECT.ORG stg.fedoraproject.org = STG.FEDORAPROJECT.ORG

6
roles/bodhi2/base/templates/production.ini.j2
View file

@ -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 admin_groups = proventesters security_respons bodhiadmin sysadmin-main bodhi_update_bots
# Users that we don't want to show up in the "leaderboard(s)" # 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 # A list of non-person users
# system_users = bodhi # system_users = bodhi
@ -704,9 +704,9 @@ debugtoolbar.hosts = 127.0.0.1 ::1
# example, postgresql://username:password@hostname/database_name # example, postgresql://username:password@hostname/database_name
# sqlalchemy.url = sqlite:////var/cache/bodhi.db # sqlalchemy.url = sqlite:////var/cache/bodhi.db
{% if env == 'production' %} {% 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' %} {% 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 %} {% endif %}
# sqlalchemy_extra.statement_timeout = 30000 # sqlalchemy_extra.statement_timeout = 30000