Replace references to iad2 with the datacenter variable in openshift apps playbooks

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
2026-03-20 03:57:02 +08:00 · 2025-06-27 14:58:12 +02:00
parent 38d138e9e0
commit 80acc1e431
17 changed files with 33 additions and 25 deletions
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -350,6 +350,14 @@ db-koji01.stg.rdu3.fedoraproject.org
 db01.stg.rdu3.fedoraproject.org
 db03.stg.rdu3.fedoraproject.org

+[apps_dbserver]
+db01.iad2.fedoraproject.org
+db01.rdu3.fedoraproject.org
+
+[apps_dbserver_stg]
+db01.stg.iad2.fedoraproject.org
+db01.stg.rdu3.fedoraproject.org
+
 [datanommer_dbserver]
 db-datanommer02.iad2.fedoraproject.org
 db-datanommer02.rdu3.fedoraproject.org
@@ -1319,7 +1327,7 @@ pagure02.fedoraproject.org
 pagure-stg01.fedoraproject.org

 [ocp:children]
-os_control
+s_control
 ocp_controlplane
 ocp_workers
 #ocp_boostrap
--- a/playbooks/openshift-apps/badges.yml
+++ b/playbooks/openshift-apps/badges.yml
@@ -4,7 +4,7 @@

 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/blockerbugs.yml
+++ b/playbooks/openshift-apps/blockerbugs.yml
@@ -1,6 +1,6 @@
 ---
 - name: Prepare setting up the database
-  hosts: db01.stg.iad2.fedoraproject.org:db01.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  user: root

@@ -13,7 +13,7 @@
    - packages

 - name: Setup the database
-  hosts: db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
@@ -39,7 +39,7 @@
      encoding: UTF-8

 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org
+  hosts: apps_dbserver
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/elections.yml
+++ b/playbooks/openshift-apps/elections.yml
@@ -1,6 +1,6 @@
 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/fmn.yml
+++ b/playbooks/openshift-apps/fmn.yml
@@ -4,7 +4,7 @@

 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
@@ -25,7 +25,7 @@
        encoding: UTF-8

 - name: Setup RabbitMQ
-  hosts: rabbitmq[0]:rabbitmq_stg[0]
+  hosts: rabbitmq_iad2[0]:rabbitmq_stg_iad2[0]:rabbitmq_rdu3[0]:rabbitmq_stg_rdu3[0]
  user: root
  gather_facts: false

--- a/playbooks/openshift-apps/kanban.yml
+++ b/playbooks/openshift-apps/kanban.yml
@@ -1,6 +1,6 @@
 ---
 - name: Prepare setting up the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  user: root

@@ -13,7 +13,7 @@
    - packages

 - name: Setup PROD database
-  hosts: db01.iad2.fedoraproject.org
+  hosts: apps_dbserver
  gather_facts: no
  become: yes
  become_user: postgres
@@ -39,7 +39,7 @@
      encoding: UTF-8

 - name: Setup STG database
-  hosts: db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/kerneltest.yml
+++ b/playbooks/openshift-apps/kerneltest.yml
@@ -1,6 +1,6 @@
 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -28,7 +28,7 @@
    keytab_secret_name: keytab
    keytab_key: krb5.keytab
    keytab_service: koschei
-    keytab_host: "koschei-backend01{{ env_suffix }}.iad2.fedoraproject.org"
+    keytab_host: "koschei-backend01{{ env_suffix }}.{{datacenter}}.fedoraproject.org"

  - role: openshift/route
    route_app: "{{ app }}"
--- a/playbooks/openshift-apps/maubot.yml
+++ b/playbooks/openshift-apps/maubot.yml
@@ -1,6 +1,6 @@
 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/mirrormanager.yml
+++ b/playbooks/openshift-apps/mirrormanager.yml
@@ -4,7 +4,7 @@

 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/oraculum.yml
+++ b/playbooks/openshift-apps/oraculum.yml
@@ -1,6 +1,6 @@
 ---
 - name: Prepare setting up the database
-  hosts: db01.stg.iad2.fedoraproject.org:db01.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  user: root

@@ -13,7 +13,7 @@
    - packages

 - name: Setup the database
-  hosts: db01.stg.iad2.fedoraproject.org:db01.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/resultsdb.yml
+++ b/playbooks/openshift-apps/resultsdb.yml
@@ -1,6 +1,6 @@
 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/testdays.yml
+++ b/playbooks/openshift-apps/testdays.yml
@@ -1,6 +1,6 @@
 ---
 - name: Prepare setting up the database
-  hosts: db01.stg.iad2.fedoraproject.org:db01.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  user: root

@@ -13,7 +13,7 @@
    - packages

 - name: Setup the database
-  hosts: db01.stg.iad2.fedoraproject.org:db01.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/waiverdb.yml
+++ b/playbooks/openshift-apps/waiverdb.yml
@@ -1,6 +1,6 @@
 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/playbooks/openshift-apps/webhook2fedmsg.yml
+++ b/playbooks/openshift-apps/webhook2fedmsg.yml
@@ -3,7 +3,7 @@
 #
 ---
 - name: Setup the database
-  hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org
+  hosts: apps_dbserver:apps_dbserver_stg
  gather_facts: no
  become: yes
  become_user: postgres
--- a/roles/rabbit/queue/defaults/main.yml
+++ b/roles/rabbit/queue/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-queue_rabbitmq_server: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
+queue_rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
 queue_vhost: /pubsub
 queue_default_exchange: amq.topic
 queue_routing_keys: []
@@ -8,4 +8,4 @@ queue_max_priority: null
 queue_thresholds:
  warning: 10000
  critical: 100000
-queue_nagios_server: noc01.iad2.fedoraproject.org
+queue_nagios_server: noc01.{{ datacenter }}.fedoraproject.org
--- a/roles/rabbit/user/defaults/main.yml
+++ b/roles/rabbit/user/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-user_rabbitmq_server: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
+user_rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
 user_vhost: /pubsub
 user_publish_only: true