diff --git a/inventory/inventory b/inventory/inventory index 36aa88dcfb..444ce15065 100644 --- 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 diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index f537e8d14f..5ea372ae6b 100644 --- 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 diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index 1d9da805a9..d757fde856 100644 --- 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 diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index 1c5b14e9ee..00252a4792 100644 --- 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 diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index 2f4faf20be..35ab365d1c 100644 --- 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 diff --git a/playbooks/openshift-apps/kanban.yml b/playbooks/openshift-apps/kanban.yml index b9e35ead9f..e66c660961 100644 --- 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 diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index f0ffbfcae1..1cd4bf7a52 100644 --- 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 diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index aaa5256994..d3c2303f12 100644 --- 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 }}" diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index 003d71c5f7..efb9cee0ef 100644 --- 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 diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index 54781e6e71..3bf70c994b 100644 --- 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 diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index 0e44e6ea6c..539d27ef93 100644 --- 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 diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index e6a5bbce0d..f9cdb6460c 100644 --- 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 diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index 20bff1692c..23e60a70a4 100644 --- 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 diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index ef95e34350..0283e98766 100644 --- 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 diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index 6f3b195dbc..c63e6cc2d6 100644 --- 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 diff --git a/roles/rabbit/queue/defaults/main.yml b/roles/rabbit/queue/defaults/main.yml index f058bb2a45..64020ad98c 100644 --- 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 diff --git a/roles/rabbit/user/defaults/main.yml b/roles/rabbit/user/defaults/main.yml index b71945e5cb..fd15b3170a 100644 --- 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