From 6c85fda0c97d842fe234433bdc3d6f7007258ba5 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 3 Jul 2025 16:20:55 +0200 Subject: [PATCH] Mass remove/replace iad2 -> rdu3, 10.3. -> 10.16. Signed-off-by: Nils Philippsen --- inventory/backups | 24 +- inventory/builders | 422 +--- inventory/group_vars/all | 2 +- inventory/group_vars/autosign | 4 +- inventory/group_vars/autosign_hardware | 4 +- inventory/group_vars/bastion | 4 +- inventory/group_vars/bastion_stg | 4 +- inventory/group_vars/batcave | 4 +- inventory/group_vars/bodhi_backend_stg | 6 +- inventory/group_vars/buildvm | 4 +- inventory/group_vars/buildvm_aarch64 | 6 +- inventory/group_vars/buildvm_aarch64_stg | 6 +- inventory/group_vars/buildvm_osbuild_ppc64le | 10 +- .../buildvm_osbuild_ppc64le_staging | 10 +- inventory/group_vars/buildvm_ppc64le | 8 +- inventory/group_vars/buildvm_ppc64le_stg | 4 +- inventory/group_vars/buildvm_s390x_kvm | 6 +- inventory/group_vars/buildvm_stg | 10 +- inventory/group_vars/buildvm_x86_riscv | 4 +- inventory/group_vars/certgetter | 4 +- inventory/group_vars/certgetter_stg | 4 +- inventory/group_vars/checkcompose | 2 +- inventory/group_vars/download_iad2 | 15 - inventory/group_vars/iad2_production | 28 - inventory/group_vars/iad2_staging | 11 - inventory/group_vars/ipa | 4 +- inventory/group_vars/ipsilon | 6 +- inventory/group_vars/ipsilon_stg | 6 +- inventory/group_vars/kernel_qa | 2 +- inventory/group_vars/kojipkgs | 4 +- inventory/group_vars/nagios | 97 +- inventory/group_vars/openqa_lab_workers | 2 +- inventory/group_vars/openqa_onebox_test | 2 +- inventory/group_vars/proxies | 60 +- inventory/group_vars/proxies_stg | 38 +- inventory/group_vars/rabbitmq | 12 +- inventory/group_vars/rabbitmq_stg | 12 +- inventory/group_vars/rdu3_staging | 1 - inventory/group_vars/releng_compose | 2 +- inventory/group_vars/releng_compose_eln | 2 +- inventory/group_vars/releng_compose_riscv | 2 +- inventory/group_vars/secondary | 2 +- inventory/group_vars/staging | 1 - inventory/group_vars/value | 12 +- inventory/group_vars/value_stg | 14 +- inventory/hardware | 160 +- .../autosign01.iad2.fedoraproject.org | 33 - .../autosign01.rdu3.fedoraproject.org | 1 - .../autosign01.stg.iad2.fedoraproject.org | 9 - .../autosign02.iad2.fedoraproject.org | 33 - .../host_vars/backup01.iad2.fedoraproject.org | 34 - .../host_vars/backup01.rdu3.fedoraproject.org | 1 - .../bastion01.iad2.fedoraproject.org | 14 - .../bastion01.rdu3.fedoraproject.org | 1 - .../bastion02.iad2.fedoraproject.org | 12 - .../bastion02.rdu3.fedoraproject.org | 1 - .../batcave01.iad2.fedoraproject.org | 18 - .../bkernel01.iad2.fedoraproject.org | 29 - .../bkernel02.iad2.fedoraproject.org | 30 - .../bodhi-backend01.iad2.fedoraproject.org | 20 - ...bodhi-backend01.stg.iad2.fedoraproject.org | 9 - .../bootstrap.ocp.iad2.fedoraproject.org | 47 - .../bootstrap.ocp.stg.iad2.fedoraproject.org | 24 - .../buildhw-a64-03.iad2.fedoraproject.org | 33 - .../buildhw-a64-04.iad2.fedoraproject.org | 33 - .../buildhw-a64-05.iad2.fedoraproject.org | 33 - .../buildhw-a64-06.iad2.fedoraproject.org | 33 - .../buildhw-x86-01.iad2.fedoraproject.org | 30 - .../buildhw-x86-02.iad2.fedoraproject.org | 34 - .../buildhw-x86-03.iad2.fedoraproject.org | 32 - .../buildhw-x86-04.iad2.fedoraproject.org | 32 - .../buildhw-x86-05.iad2.fedoraproject.org | 33 - .../buildhw-x86-06.iad2.fedoraproject.org | 32 - .../buildhw-x86-07.iad2.fedoraproject.org | 32 - .../buildhw-x86-08.iad2.fedoraproject.org | 32 - .../buildhw-x86-09.iad2.fedoraproject.org | 32 - .../buildhw-x86-10.iad2.fedoraproject.org | 32 - .../buildhw-x86-11.iad2.fedoraproject.org | 32 - .../buildhw-x86-12.iad2.fedoraproject.org | 32 - .../buildhw-x86-13.iad2.fedoraproject.org | 32 - .../buildhw-x86-14.iad2.fedoraproject.org | 32 - .../buildhw-x86-15.iad2.fedoraproject.org | 32 - .../buildhw-x86-16.iad2.fedoraproject.org | 32 - .../buildvm-a64-01.iad2.fedoraproject.org | 4 - .../buildvm-a64-01.stg.iad2.fedoraproject.org | 4 - .../buildvm-a64-02.iad2.fedoraproject.org | 4 - .../buildvm-a64-02.stg.iad2.fedoraproject.org | 4 - .../buildvm-a64-03.iad2.fedoraproject.org | 4 - .../buildvm-a64-04.iad2.fedoraproject.org | 4 - .../buildvm-a64-05.iad2.fedoraproject.org | 4 - .../buildvm-a64-06.iad2.fedoraproject.org | 4 - .../buildvm-a64-07.iad2.fedoraproject.org | 4 - .../buildvm-a64-08.iad2.fedoraproject.org | 4 - .../buildvm-a64-09.iad2.fedoraproject.org | 4 - .../buildvm-a64-10.iad2.fedoraproject.org | 4 - .../buildvm-a64-11.iad2.fedoraproject.org | 4 - .../buildvm-a64-12.iad2.fedoraproject.org | 4 - .../buildvm-a64-13.iad2.fedoraproject.org | 4 - .../buildvm-a64-14.iad2.fedoraproject.org | 4 - .../buildvm-a64-15.iad2.fedoraproject.org | 4 - .../buildvm-a64-16.iad2.fedoraproject.org | 4 - .../buildvm-a64-17.iad2.fedoraproject.org | 4 - .../buildvm-a64-18.iad2.fedoraproject.org | 4 - .../buildvm-a64-19.iad2.fedoraproject.org | 4 - .../buildvm-a64-20.iad2.fedoraproject.org | 4 - .../buildvm-a64-21.iad2.fedoraproject.org | 4 - .../buildvm-a64-22.iad2.fedoraproject.org | 4 - .../buildvm-a64-23.iad2.fedoraproject.org | 4 - .../buildvm-a64-24.iad2.fedoraproject.org | 4 - .../buildvm-a64-25.iad2.fedoraproject.org | 4 - .../buildvm-a64-26.iad2.fedoraproject.org | 4 - .../buildvm-a64-27.iad2.fedoraproject.org | 4 - .../buildvm-a64-28.iad2.fedoraproject.org | 3 - .../buildvm-a64-29.iad2.fedoraproject.org | 3 - .../buildvm-a64-30.iad2.fedoraproject.org | 3 - .../buildvm-a64-31.iad2.fedoraproject.org | 4 - .../buildvm-a64-32.iad2.fedoraproject.org | 4 - .../buildvm-a64-33.iad2.fedoraproject.org | 4 - .../buildvm-a64-34.iad2.fedoraproject.org | 4 - .../buildvm-a64-35.iad2.fedoraproject.org | 4 - .../buildvm-a64-36.iad2.fedoraproject.org | 4 - .../buildvm-a64-37.iad2.fedoraproject.org | 4 - .../buildvm-a64-38.iad2.fedoraproject.org | 4 - .../buildvm-a64-39.iad2.fedoraproject.org | 4 - .../buildvm-a64-40.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-01.iad2.fedoraproject.org | 4 - ...ldvm-ppc64le-01.stg.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-02.iad2.fedoraproject.org | 4 - ...ldvm-ppc64le-02.stg.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-03.iad2.fedoraproject.org | 4 - ...ldvm-ppc64le-03.stg.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-04.iad2.fedoraproject.org | 4 - ...ldvm-ppc64le-04.stg.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-05.iad2.fedoraproject.org | 4 - ...ldvm-ppc64le-05.stg.iad2.fedoraproject.org | 5 - .../buildvm-ppc64le-06.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-07.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-08.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-09.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-10.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-11.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-12.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-13.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-14.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-15.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-16.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-17.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-18.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-19.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-20.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-21.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-22.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-23.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-24.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-25.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-26.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-27.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-28.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-29.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-30.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-31.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-32.iad2.fedoraproject.org | 4 - .../buildvm-ppc64le-33.iad2.fedoraproject.org | 4 - .../buildvm-rdu3-01.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-02.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-03.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-04.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-05.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-06.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-07.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-08.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-09.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-10.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-11.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-12.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-13.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-14.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-15.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-16.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-17.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-18.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-19.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-20.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-21.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-22.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-23.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-24.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-25.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-26.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-27.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-28.rdu3.fedoraproject.org | 3 - .../buildvm-rdu3-29.rdu3.fedoraproject.org | 3 - .../buildvm-rdu3-30.rdu3.fedoraproject.org | 3 - .../buildvm-rdu3-31.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-32.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-33.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-34.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-35.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-36.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-37.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-38.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-39.rdu3.fedoraproject.org | 4 - .../buildvm-rdu3-40.rdu3.fedoraproject.org | 4 - .../buildvm-x86-01.iad2.fedoraproject.org | 7 - .../buildvm-x86-01.stg.iad2.fedoraproject.org | 3 - .../buildvm-x86-02.iad2.fedoraproject.org | 7 - .../buildvm-x86-02.stg.iad2.fedoraproject.org | 3 - .../buildvm-x86-03.iad2.fedoraproject.org | 7 - .../buildvm-x86-03.stg.iad2.fedoraproject.org | 3 - .../buildvm-x86-04.iad2.fedoraproject.org | 7 - .../buildvm-x86-04.stg.iad2.fedoraproject.org | 3 - .../buildvm-x86-05.iad2.fedoraproject.org | 7 - .../buildvm-x86-05.stg.iad2.fedoraproject.org | 3 - .../buildvm-x86-06.iad2.fedoraproject.org | 7 - .../buildvm-x86-07.iad2.fedoraproject.org | 7 - .../buildvm-x86-08.iad2.fedoraproject.org | 7 - .../buildvm-x86-09.iad2.fedoraproject.org | 7 - .../buildvm-x86-10.iad2.fedoraproject.org | 7 - .../buildvm-x86-11.iad2.fedoraproject.org | 7 - .../buildvm-x86-12.iad2.fedoraproject.org | 7 - .../buildvm-x86-13.iad2.fedoraproject.org | 7 - .../buildvm-x86-14.iad2.fedoraproject.org | 7 - .../buildvm-x86-15.iad2.fedoraproject.org | 7 - .../buildvm-x86-16.iad2.fedoraproject.org | 7 - .../buildvm-x86-17.iad2.fedoraproject.org | 7 - .../buildvm-x86-18.iad2.fedoraproject.org | 7 - .../buildvm-x86-19.iad2.fedoraproject.org | 7 - .../buildvm-x86-20.iad2.fedoraproject.org | 7 - .../buildvm-x86-21.iad2.fedoraproject.org | 7 - .../buildvm-x86-22.iad2.fedoraproject.org | 7 - .../buildvm-x86-23.iad2.fedoraproject.org | 7 - .../buildvm-x86-24.iad2.fedoraproject.org | 7 - .../buildvm-x86-25.iad2.fedoraproject.org | 7 - .../buildvm-x86-26.iad2.fedoraproject.org | 7 - .../buildvm-x86-27.iad2.fedoraproject.org | 7 - .../buildvm-x86-28.iad2.fedoraproject.org | 7 - .../buildvm-x86-29.iad2.fedoraproject.org | 7 - .../buildvm-x86-30.iad2.fedoraproject.org | 7 - .../buildvm-x86-31.iad2.fedoraproject.org | 7 - .../buildvm-x86-32.iad2.fedoraproject.org | 7 - ...buildvm-x86-riscv01.iad2.fedoraproject.org | 7 - ...buildvm-x86-riscv02.iad2.fedoraproject.org | 7 - .../busgateway01.iad2.fedoraproject.org | 8 - .../busgateway01.stg.iad2.fedoraproject.org | 8 - .../bvmhost-a64-01.iad2.fedoraproject.org | 37 - .../bvmhost-a64-01.stg.iad2.fedoraproject.org | 39 - .../bvmhost-a64-02.iad2.fedoraproject.org | 37 - .../bvmhost-a64-03.iad2.fedoraproject.org | 37 - .../bvmhost-a64-04.iad2.fedoraproject.org | 37 - ...bvmhost-a64-osbs-01.iad2.fedoraproject.org | 35 - .../bvmhost-p09-01.iad2.fedoraproject.org | 37 - .../bvmhost-p09-01.stg.iad2.fedoraproject.org | 39 - .../bvmhost-p09-02.iad2.fedoraproject.org | 38 - .../bvmhost-p09-03.iad2.fedoraproject.org | 37 - .../bvmhost-p09-04.iad2.fedoraproject.org | 39 - .../bvmhost-p09-05.iad2.fedoraproject.org | 38 - .../bvmhost-p10-01.rdu3.fedoraproject.org | 1 - .../bvmhost-s390x-01.s390.fedoraproject.org | 6 +- ...vmhost-s390x-01.stg.s390.fedoraproject.org | 8 +- .../bvmhost-x86-01.iad2.fedoraproject.org | 35 - .../bvmhost-x86-01.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-01.stg.iad2.fedoraproject.org | 40 - .../bvmhost-x86-01.stg.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-02.iad2.fedoraproject.org | 38 - .../bvmhost-x86-02.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-02.stg.iad2.fedoraproject.org | 40 - .../bvmhost-x86-02.stg.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-03.iad2.fedoraproject.org | 38 - .../bvmhost-x86-03.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-03.stg.iad2.fedoraproject.org | 40 - .../bvmhost-x86-03.stg.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-04.iad2.fedoraproject.org | 38 - .../bvmhost-x86-04.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-05.iad2.fedoraproject.org | 38 - .../bvmhost-x86-05.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-05.stg.iad2.fedoraproject.org | 45 - .../bvmhost-x86-06.iad2.fedoraproject.org | 38 - .../bvmhost-x86-06.rdu3.fedoraproject.org | 1 - .../bvmhost-x86-07.iad2.fedoraproject.org | 38 - .../bvmhost-x86-08.iad2.fedoraproject.org | 46 - ...bvmhost-x86-riscv01.iad2.fedoraproject.org | 36 - ...bvmhost-x86-riscv01.rdu3.fedoraproject.org | 1 - ...os-ipa-client01.stg.iad2.fedoraproject.org | 15 - ...os-ipa-client02.stg.iad2.fedoraproject.org | 15 - ...os-ipa-client03.stg.iad2.fedoraproject.org | 15 - ...os-ipa-client04.stg.iad2.fedoraproject.org | 15 - .../certgetter01.iad2.fedoraproject.org | 9 - .../compose-branched01.iad2.fedoraproject.org | 13 - .../compose-eln01.iad2.fedoraproject.org | 15 - .../compose-iot01.iad2.fedoraproject.org | 15 - .../compose-rawhide01.iad2.fedoraproject.org | 14 - .../compose-x86-01.iad2.fedoraproject.org | 17 - .../compose-x86-01.stg.iad2.fedoraproject.org | 11 - .../data-reports01.iad2.fedoraproject.org | 8 - ...db-datanommer01.stg.iad2.fedoraproject.org | 26 - .../db-datanommer02.iad2.fedoraproject.org | 37 - .../db-datanommer02.rdu3.fedoraproject.org | 1 - .../host_vars/db-fas01.iad2.fedoraproject.org | 52 - .../host_vars/db-fas01.rdu3.fedoraproject.org | 1 - .../db-fas01.stg.iad2.fedoraproject.org | 42 - .../db-koji01.iad2.fedoraproject.org | 49 - .../db-koji01.rdu3.fedoraproject.org | 1 - .../db-koji01.stg.iad2.fedoraproject.org | 30 - .../db-openqa01.iad2.fedoraproject.org | 31 - .../host_vars/db01.iad2.fedoraproject.org | 77 - .../host_vars/db01.rdu3.fedoraproject.org | 1 - .../host_vars/db01.stg.iad2.fedoraproject.org | 36 - .../host_vars/db03.iad2.fedoraproject.org | 26 - .../host_vars/db03.rdu3.fedoraproject.org | 1 - .../host_vars/db03.stg.iad2.fedoraproject.org | 24 - .../debuginfod01.iad2.fedoraproject.org | 11 - .../debuginfod01.stg.iad2.fedoraproject.org | 9 - .../host_vars/dl01.iad2.fedoraproject.org | 18 - .../host_vars/dl02.iad2.fedoraproject.org | 19 - .../host_vars/dl03.iad2.fedoraproject.org | 19 - .../host_vars/dl04.iad2.fedoraproject.org | 19 - .../host_vars/dl05.iad2.fedoraproject.org | 17 - .../flatpak-cache01.iad2.fedoraproject.org | 8 - .../github2fedmsg01.iad2.fedoraproject.org | 8 - .../host_vars/ipa01.iad2.fedoraproject.org | 8 - .../ipa01.stg.iad2.fedoraproject.org | 10 - .../host_vars/ipa02.iad2.fedoraproject.org | 8 - .../ipa02.stg.iad2.fedoraproject.org | 15 - .../host_vars/ipa03.iad2.fedoraproject.org | 8 - .../ipa03.stg.iad2.fedoraproject.org | 15 - .../ipsilon01.iad2.fedoraproject.org | 8 - .../ipsilon01.stg.iad2.fedoraproject.org | 8 - .../ipsilon02.iad2.fedoraproject.org | 8 - .../host_vars/kernel01.iad2.fedoraproject.org | 7 - .../host_vars/kernel02.iad2.fedoraproject.org | 7 - .../host_vars/koji01.iad2.fedoraproject.org | 15 - .../host_vars/koji01.rdu3.fedoraproject.org | 1 - .../koji01.stg.iad2.fedoraproject.org | 15 - .../host_vars/koji02.iad2.fedoraproject.org | 15 - .../host_vars/koji02.rdu3.fedoraproject.org | 1 - .../kojipkgs01.iad2.fedoraproject.org | 11 - .../kojipkgs02.iad2.fedoraproject.org | 11 - .../host_vars/log01.iad2.fedoraproject.org | 18 - .../mailman01.iad2.fedoraproject.org | 14 - .../mailman01.stg.iad2.fedoraproject.org | 13 - .../mailman01.stg.rdu3.fedoraproject.org | 1 - .../memcached02.iad2.fedoraproject.org | 8 - .../memcached02.stg.iad2.fedoraproject.org | 8 - .../host_vars/noc01.iad2.fedoraproject.org | 27 - .../host_vars/ns01.iad2.fedoraproject.org | 12 - .../host_vars/ns01.rdu3.fedoraproject.org | 1 - .../host_vars/ns02.iad2.fedoraproject.org | 12 - .../host_vars/ns02.rdu3.fedoraproject.org | 1 - ...andidate-registry01.iad2.fedoraproject.org | 14 - ...date-registry01.stg.iad2.fedoraproject.org | 14 - .../oci-registry01.iad2.fedoraproject.org | 14 - .../oci-registry01.stg.iad2.fedoraproject.org | 14 - .../oci-registry02.iad2.fedoraproject.org | 14 - .../ocp01.ocp.iad2.fedoraproject.org | 47 - .../ocp01.ocp.stg.iad2.fedoraproject.org | 48 - .../ocp02.ocp.iad2.fedoraproject.org | 47 - .../ocp02.ocp.stg.iad2.fedoraproject.org | 48 - .../ocp03.ocp.iad2.fedoraproject.org | 47 - .../ocp03.ocp.stg.iad2.fedoraproject.org | 48 - ...openqa-a64-worker01.iad2.fedoraproject.org | 64 - ...openqa-a64-worker01.rdu3.fedoraproject.org | 1 - ...openqa-a64-worker02.iad2.fedoraproject.org | 64 - ...openqa-a64-worker02.rdu3.fedoraproject.org | 1 - ...openqa-a64-worker03.iad2.fedoraproject.org | 64 - ...openqa-a64-worker04.iad2.fedoraproject.org | 74 - ...openqa-a64-worker05.iad2.fedoraproject.org | 64 - ...openqa-a64-worker06.iad2.fedoraproject.org | 64 - ...openqa-p09-worker01.iad2.fedoraproject.org | 59 - ...openqa-p09-worker02.iad2.fedoraproject.org | 64 - ...openqa-x86-worker01.iad2.fedoraproject.org | 74 - ...openqa-x86-worker01.rdu3.fedoraproject.org | 1 - ...openqa-x86-worker02.iad2.fedoraproject.org | 74 - ...openqa-x86-worker02.rdu3.fedoraproject.org | 1 - ...openqa-x86-worker03.iad2.fedoraproject.org | 71 - ...openqa-x86-worker03.rdu3.fedoraproject.org | 1 - ...openqa-x86-worker04.iad2.fedoraproject.org | 74 - ...openqa-x86-worker04.rdu3.fedoraproject.org | 1 - ...openqa-x86-worker05.iad2.fedoraproject.org | 71 - ...openqa-x86-worker05.rdu3.fedoraproject.org | 1 - ...openqa-x86-worker06.iad2.fedoraproject.org | 71 - .../host_vars/openqa01.iad2.fedoraproject.org | 22 - .../os-control01.iad2.fedoraproject.org | 18 - .../os-control01.stg.iad2.fedoraproject.org | 11 - .../host_vars/pagure-stg01.fedoraproject.org | 4 +- .../host_vars/pkgs01.iad2.fedoraproject.org | 27 - .../pkgs01.stg.iad2.fedoraproject.org | 14 - .../host_vars/proxy01.iad2.fedoraproject.org | 47 - .../proxy01.stg.iad2.fedoraproject.org | 14 - .../proxy02.stg.iad2.fedoraproject.org | 14 - .../host_vars/proxy10.iad2.fedoraproject.org | 47 - .../host_vars/proxy101.iad2.fedoraproject.org | 41 - .../host_vars/proxy110.iad2.fedoraproject.org | 41 - .../qvmhost-x86-01.iad2.fedoraproject.org | 35 - .../qvmhost-x86-01.rdu3.fedoraproject.org | 1 - .../qvmhost-x86-02.iad2.fedoraproject.org | 38 - .../rabbitmq01.iad2.fedoraproject.org | 8 - .../rabbitmq01.rdu3.fedoraproject.org | 1 - .../rabbitmq01.stg.iad2.fedoraproject.org | 8 - .../rabbitmq02.iad2.fedoraproject.org | 8 - .../rabbitmq02.rdu3.fedoraproject.org | 1 - .../rabbitmq02.stg.iad2.fedoraproject.org | 8 - .../rabbitmq03.iad2.fedoraproject.org | 8 - .../rabbitmq03.rdu3.fedoraproject.org | 1 - .../rabbitmq03.stg.iad2.fedoraproject.org | 8 - .../secondary01.iad2.fedoraproject.org | 16 - .../sign-bridge01.iad2.fedoraproject.org | 8 - .../sign-bridge01.stg.iad2.fedoraproject.org | 8 - .../sign-vault01.iad2.fedoraproject.org | 7 - .../sign-vault01.rdu3.fedoraproject.org | 1 - .../sign-vault01.stg.iad2.fedoraproject.org | 9 - .../sign-vault02.iad2.fedoraproject.org | 31 - .../sundries01.iad2.fedoraproject.org | 12 - .../sundries01.stg.iad2.fedoraproject.org | 12 - .../sundries02.iad2.fedoraproject.org | 12 - .../sundries02.stg.iad2.fedoraproject.org | 12 - .../host_vars/tang01.iad2.fedoraproject.org | 12 - .../host_vars/tang01.rdu3.fedoraproject.org | 1 - .../host_vars/tang02.iad2.fedoraproject.org | 12 - .../host_vars/tang02.rdu3.fedoraproject.org | 1 - .../host_vars/value02.iad2.fedoraproject.org | 13 - .../value02.stg.iad2.fedoraproject.org | 9 - .../vmhost-x86-01.iad2.fedoraproject.org | 35 - .../vmhost-x86-01.rdu3.fedoraproject.org | 1 - .../vmhost-x86-01.stg.iad2.fedoraproject.org | 43 - .../vmhost-x86-01.stg.rdu3.fedoraproject.org | 1 - .../vmhost-x86-02.iad2.fedoraproject.org | 35 - .../vmhost-x86-02.rdu3.fedoraproject.org | 1 - .../vmhost-x86-02.stg.iad2.fedoraproject.org | 43 - .../vmhost-x86-02.stg.rdu3.fedoraproject.org | 1 - .../vmhost-x86-03.iad2.fedoraproject.org | 35 - .../vmhost-x86-03.rdu3.fedoraproject.org | 1 - .../vmhost-x86-03.stg.iad2.fedoraproject.org | 42 - .../vmhost-x86-03.stg.rdu3.fedoraproject.org | 1 - .../vmhost-x86-04.iad2.fedoraproject.org | 35 - .../vmhost-x86-04.rdu3.fedoraproject.org | 1 - .../vmhost-x86-04.stg.iad2.fedoraproject.org | 42 - .../vmhost-x86-04.stg.rdu3.fedoraproject.org | 1 - .../vmhost-x86-05.iad2.fedoraproject.org | 35 - .../vmhost-x86-05.rdu3.fedoraproject.org | 1 - .../vmhost-x86-05.stg.iad2.fedoraproject.org | 45 - .../vmhost-x86-05.stg.rdu3.fedoraproject.org | 1 - .../vmhost-x86-06.iad2.fedoraproject.org | 35 - .../vmhost-x86-06.stg.iad2.fedoraproject.org | 45 - .../vmhost-x86-07.iad2.fedoraproject.org | 35 - .../vmhost-x86-07.stg.iad2.fedoraproject.org | 45 - .../vmhost-x86-08.iad2.fedoraproject.org | 36 - .../vmhost-x86-08.stg.iad2.fedoraproject.org | 43 - .../vmhost-x86-09.iad2.fedoraproject.org | 36 - .../vmhost-x86-09.stg.iad2.fedoraproject.org | 43 - .../vmhost-x86-11.stg.iad2.fedoraproject.org | 45 - .../vmhost-x86-12.stg.iad2.fedoraproject.org | 45 - .../host_vars/wiki01.iad2.fedoraproject.org | 8 - .../host_vars/wiki01.rdu3.fedoraproject.org | 1 - .../wiki01.stg.iad2.fedoraproject.org | 8 - .../host_vars/wiki02.iad2.fedoraproject.org | 8 - .../host_vars/wiki02.rdu3.fedoraproject.org | 1 - .../worker01.ocp.iad2.fedoraproject.org | 45 - .../worker01.ocp.stg.iad2.fedoraproject.org | 46 - .../worker02.ocp.iad2.fedoraproject.org | 45 - .../worker02.ocp.stg.iad2.fedoraproject.org | 46 - .../worker03.ocp.iad2.fedoraproject.org | 45 - .../worker03.ocp.stg.iad2.fedoraproject.org | 46 - .../worker04.ocp.iad2.fedoraproject.org | 45 - .../worker04.ocp.stg.iad2.fedoraproject.org | 48 - .../worker05.ocp.iad2.fedoraproject.org | 45 - .../worker05.ocp.stg.iad2.fedoraproject.org | 48 - .../worker06.ocp.iad2.fedoraproject.org | 45 - .../host_vars/zabbix01.iad2.fedoraproject.org | 9 - .../zabbix01.stg.iad2.fedoraproject.org | 9 - inventory/inventory | 590 +---- inventory/zzz-inventory.config | 6 +- playbooks/destroy_virt_inst.yml | 2 +- playbooks/groups/backup-server.yml | 4 +- playbooks/groups/batcave.yml | 4 +- playbooks/groups/dns.yml | 2 +- playbooks/groups/download.yml | 10 +- playbooks/groups/ipsilon.yml | 4 +- playbooks/groups/koji-hub.yml | 2 +- playbooks/groups/logserver.yml | 4 +- playbooks/groups/mailman.yml | 4 +- playbooks/groups/mariadb-server.yml | 12 +- playbooks/groups/noc.yml | 10 +- playbooks/groups/postgresql-server.yml | 22 +- playbooks/groups/rabbitmq.yml | 4 +- playbooks/groups/releng-compose.yml | 2 +- playbooks/groups/virthost.yml | 5 +- playbooks/host_reboot.yml | 4 +- playbooks/include/proxies-websites.yml | 8 +- playbooks/manual/autosign.yml | 12 +- .../manual/fas-readonly/fas-readonly.yml | 2 +- .../manual/fas-readonly/rollback-readonly.yml | 2 +- playbooks/manual/get-system-packages.yml | 2 +- .../manual/import-irc-cookies-to-matrix.yml | 2 +- playbooks/manual/nagios/shush-fmn.yml | 2 +- playbooks/manual/oci-registry-prune.yml | 6 +- playbooks/manual/releng/koji-release-tags.yml | 2 +- .../manual/releng/templates/koji.conf.j2 | 4 +- playbooks/manual/restart-pagure.yml | 2 +- playbooks/manual/riscv-keytabs.yml | 2 +- playbooks/manual/sign-vault.yml | 6 +- playbooks/manual/staging-sync/badges.yml | 6 +- playbooks/manual/staging-sync/bodhi.yml | 6 +- playbooks/manual/staging-sync/db-sync.yml | 16 +- playbooks/manual/staging-sync/koji.yml | 2 +- playbooks/manual/staging-sync/mailman.yml | 2 +- .../templates/koji-reset-staging.sql | 6 +- playbooks/manual/sync-hosts.yml | 4 +- playbooks/manual/upgrade/bodhi.yml | 10 +- playbooks/manual/upgrade/bugzilla2fedmsg.yml | 4 +- playbooks/manual/upgrade/datagrepper.yml | 4 +- playbooks/manual/upgrade/datanommer.yml | 4 +- playbooks/manual/upgrade/koji.yml | 6 +- playbooks/manual/upgrade/mote.yml | 4 +- playbooks/manual/upgrade/pagure.yml | 4 +- playbooks/openshift-apps/fmn.yml | 2 +- playbooks/universe_update.yml | 2 +- playbooks/update_ticketkey.yml | 2 +- playbooks/vhost_halt_guests.yml | 2 +- playbooks/vhost_reboot.yml | 6 +- playbooks/vhost_update.yml | 2 +- .../files/postfix/main.cf/main.cf.gateway | 2 +- roles/base/files/postfix/main.cf/main.cf.iad2 | 692 ------ .../postfix/main.cf/main.cf.kojibuilder_iad2 | 691 ------ ...n.cf.mailman01.stg.rdu3.fedoraproject.org} | 2 +- roles/base/files/postfix/transports.gateway | 6 +- .../rsyslog.conf.log01.iad2.fedoraproject.org | 236 -- roles/base/files/setprodiad2ps1.sh | 3 - roles/base/tasks/main.yml | 21 +- roles/base/templates/ifcfg.j2 | 8 +- roles/base/templates/iptables/iptables | 22 +- .../base/templates/iptables/iptables.bastion | 24 +- .../templates/iptables/iptables.kojibuilder | 190 +- roles/base/templates/iptables/iptables.osuosl | 10 +- roles/base/templates/iptables/iptables.releng | 12 +- .../base/templates/iptables/iptables.staging | 8 +- ...iptables.storinator01.fedorainfracloud.org | 4 +- .../iptables.torrent02.fedoraproject.org | 6 +- roles/base/templates/nftables/nftables | 26 +- .../base/templates/nftables/nftables.bastion | 24 +- .../templates/nftables/nftables.kojibuilder | 22 +- roles/base/templates/nftables/nftables.osuosl | 6 +- roles/base/templates/nftables/nftables.releng | 12 +- .../base/templates/nftables/nftables.staging | 8 +- ...nftables.storinator01.fedorainfracloud.org | 6 +- .../nftables.torrent02.fedoraproject.org | 8 +- roles/batcave/files/allows | 4 +- roles/batcave/files/centos-10-sync | 2 +- roles/batcave/files/centos-9s-sync | 2 +- roles/batcave/files/ssh_known_hosts | 4 +- roles/chrony/templates/chrony.conf.j2 | 9 +- .../dhcpd.conf.noc01.iad2.fedoraproject.org | 2029 ----------------- roles/dns/files/named.conf | 267 --- roles/flatpak-cache/templates/squid.conf | 4 +- roles/haproxy/files/ipa.production-iad2.pem | 23 - roles/haproxy/files/ipa.staging-iad2.pem | 27 - roles/haproxy/files/ocp.prod-iad2.pem | 162 -- roles/haproxy/files/ocp.stg-iad2.pem | 162 -- .../files/os-master.production-iad2.pem | 18 - .../haproxy/files/os-master.staging-iad2.pem | 18 - roles/haproxy/tasks/main.yml | 2 +- roles/haproxy/templates/haproxy.cfg | 64 +- .../bastion01.iad2.fedoraproject.org-hosts | 4 - .../koji01.stg.iad2.fedoraproject.org-hosts | 4 - .../files/ns13.rdu2.fedoraproject.org-hosts | 8 +- .../proxy01.iad2.fedoraproject.org-hosts | 2 - .../proxy10.iad2.fedoraproject.org-hosts | 2 - .../proxy101.iad2.fedoraproject.org-hosts | 2 - .../proxy110.iad2.fedoraproject.org-hosts | 2 - roles/hosts/files/vpn | 6 +- roles/hosts/tasks/main.yml | 8 +- .../templates/reversepassproxy.00-ipa.conf | 4 +- .../reversepassproxy.conf-nonopenshift-iad2 | 64 - .../reversepassproxy.flatpak-cache.conf | 8 +- .../templates/reversepassproxy.git.conf | 2 +- .../templates/reversepassproxy.koji.conf | 4 +- .../templates/reversepassproxy.kojipkgs.conf | 2 +- .../templates/reversepassproxy.nagios.conf | 2 +- .../reversepassproxy.registry-generic.conf | 6 +- .../reversepassproxy.taskotron-resultsdb.conf | 2 +- ...versepassproxy.taskotron-resultsdbapi.conf | 2 +- roles/ipa/client/tasks/vpn.yml | 2 +- roles/iscsi_client/files/multipath.conf | 69 - roles/iscsi_client/tasks/main.yml | 77 - .../templates/initiatorname.iscsi.j2 | 1 - roles/iscsi_client/vars/main.yml | 12 - roles/kerneltest/templates/kerneltest.cfg | 2 +- .../templates/hardware-fedora-06disk-nvme.j2 | 2 +- .../templates/hardware-fedora-06disk.j2 | 2 +- .../templates/openqa-fedora-08disk.j2 | 4 +- roles/koji_builder/templates/kojid.conf | 2 +- roles/koji_hub/templates/koji-gc.conf.j2 | 2 +- roles/kojipkgs/templates/kojipkgs.conf | 4 +- .../my.cnf.db-qa01.iad2.fedoraproject.org | 156 -- .../templates/LocalSettings.php.fp.j2 | 16 +- roles/nagios_client/tasks/main.yml | 2 +- .../templates/check_rabbitmq_cluster.cfg.j2 | 2 +- roles/nagios_client/templates/nrpe.cfg.j2 | 4 +- .../files/nagios/servicedeps/websitedeps.cfg | 4 +- ...{iad2-mgmt-http.cfg => rdu3-mgmt-http.cfg} | 0 .../nagios/services/iad2_internal/basset.cfg | 28 - .../services/iad2_internal/certgetter.cfg | 6 - .../nagios/services/rdu3_internal/basset.cfg | 27 + .../services/rdu3_internal/certgetter.cfg | 6 + .../db_backups.cfg | 2 +- .../{iad2_internal => rdu3_internal}/disk.cfg | 27 +- .../fedora_messaging.cfg | 42 +- .../file_age.cfg | 22 +- .../{iad2_internal => rdu3_internal}/koji.cfg | 4 +- .../locking.cfg | 2 +- .../mailman.cfg | 2 +- .../{iad2_internal => rdu3_internal}/nrpe.cfg | 2 +- .../pgsql.cfg | 4 +- .../rabbitmq.cfg | 28 +- roles/nagios_server/tasks/main.yml | 38 +- .../templates/httpd/nagios.conf.j2 | 2 +- .../nagios/hostgroups/all-iad2.cfg.j2 | 46 - .../nagios/hostgroups/all-rdu3.cfg.j2 | 4 +- .../templates/nagios/hostgroups/all.cfg.j2 | 4 +- .../templates/nagios/hostgroups/other.cfg.j2 | 6 +- .../nagios/hostgroups/vpnclients.cfg.j2 | 2 +- .../nagios/hosts/bodhost-hosts.cfg.j2 | 2 +- .../hosts/dedicatedsolutions-hosts.cfg.j2 | 2 +- .../nagios/hosts/gateway-hosts.cfg.j2 | 50 +- .../nagios/hosts/host1plus-hosts.cfg.j2 | 2 +- .../nagios/hosts/iad2-external.cfg.j2 | 9 - .../templates/nagios/hosts/iad2-hosts.cfg.j2 | 32 - .../nagios/hosts/iad2-mgmt-hosts.cfg.j2 | 23 - .../nagios/hosts/ibiblio-hosts.cfg.j2 | 2 +- .../nagios/hosts/internetx-hosts.cfg.j2 | 2 +- .../nagios/hosts/osuosl-hosts.cfg.j2 | 2 +- .../templates/nagios/hosts/other.cfg.j2 | 18 +- .../nagios/hosts/rdu-cc-hosts.cfg.j2 | 2 +- .../templates/nagios/hosts/rdu-hosts.cfg.j2 | 2 +- .../nagios/hosts/staging-hosts.cfg.j2 | 4 +- .../{iad2-mgmt.cfg.j2 => rdu3-mgmt.cfg.j2} | 2 +- .../templates/nagios/services/websites.cfg.j2 | 8 +- .../nagios_server/templates/nrpe/nrpe.cfg.j2 | 4 +- roles/nfs/client/tasks/main.yml | 41 +- .../koji01.iad2.fedoraproject.org-exports | 1 - .../koji01.rdu3.fedoraproject.org-exports | 1 + .../koji01.stg.iad2.fedoraproject.org-exports | 1 - .../koji02.iad2.fedoraproject.org-exports | 1 - .../koji02.rdu3.fedoraproject.org-exports | 1 + roles/opendkim/files/TrustedHosts | 2 +- .../firmitas/templates/certlist.yml.j2 | 12 +- .../mirrormanager/templates/ssh_known_hosts | 4 +- .../openvpn/templates/deployment.yml.j2 | 6 +- .../openvpn/templates/secrets.yml.j2 | 12 +- .../templates/deploymentconfig.yml.j2 | 4 +- roles/openshift/project/defaults/main.yml | 2 +- .../project/templates/egresspolicy.yml.j2 | 6 +- .../ccd/aarch64-test01.fedorainfracloud.org | 2 - .../files/ccd/backup01.iad2.fedoraproject.org | 2 - .../badges-backend01.iad2.fedoraproject.org | 2 - .../ccd/badges-web01.iad2.fedoraproject.org | 2 - .../ccd/batcave01.iad2.fedoraproject.org | 2 - .../ccd/blockerbugs01.iad2.fedoraproject.org | 2 - .../ccd/busgateway01.iad2.fedoraproject.org | 1 - .../ccd/certgetter01.iad2.fedoraproject.org | 2 - .../ccd/certgetter01.rdu3.fedoraproject.org | 2 - .../cloud-noc-os01.rdu-cc.fedoraproject.org | 2 - .../files/ccd/coloamer01.fedoraproject.org | 2 - .../ccd/datagrepper01.iad2.fedoraproject.org | 1 - .../ccd/datagrepper02.iad2.fedoraproject.org | 2 - .../ccd/debuginfod01.iad2.fedoraproject.org | 2 - .../dedicatedsolutions01.fedoraproject.org | 1 - .../ccd/download-cc-rdu01.fedoraproject.org | 2 - .../files/ccd/download-ib01.fedoraproject.org | 2 - .../files/ccd/download-ib02.fedoraproject.org | 2 - .../ccd/download-rdu01.fedoraproject.org | 2 - .../files/ccd/el7-test.fedorainfracloud.org | 2 - .../files/ccd/el8-test.fedorainfracloud.org | 2 - .../files/ccd/el9-test.fedorainfracloud.org | 2 - .../files/ccd/f32-test.fedorainfracloud.org | 2 - .../files/ccd/f33-test.fedorainfracloud.org | 2 - .../files/ccd/f36-test.fedorainfracloud.org | 2 - .../files/ccd/f38-test.fedorainfracloud.org | 2 - .../files/ccd/f39-test.fedorainfracloud.org | 2 - .../ccd/fedocal01.iad2.fedoraproject.org | 2 - .../ccd/fedocal02.iad2.fedoraproject.org | 2 - .../github2fedmsg01.iad2.fedoraproject.org | 2 - .../files/ccd/host1plus01.fedoraproject.org | 2 - .../files/ccd/ibiblio01.fedoraproject.org | 2 - .../files/ccd/ibiblio02.fedoraproject.org | 2 - .../files/ccd/ibiblio05.fedoraproject.org | 2 - .../files/ccd/internetx01.fedoraproject.org | 2 - .../files/ccd/internetx02.fedoraproject.org | 2 - .../files/ccd/ipa01.iad2.fedoraproject.org | 2 - .../files/ccd/ipa02.iad2.fedoraproject.org | 2 - .../files/ccd/ipa03.iad2.fedoraproject.org | 2 - .../ccd/ipsilon01.iad2.fedoraproject.org | 2 - .../ccd/ipsilon02.iad2.fedoraproject.org | 2 - .../ccd/kerneltest01.iad2.fedoraproject.org | 2 - .../files/ccd/log01.iad2.fedoraproject.org | 2 - .../ccd/mailman01.iad2.fedoraproject.org | 2 - .../ccd/mailman02.iad2.fedoraproject.org | 2 - .../ccd/mbs-frontend01.iad2.fedoraproject.org | 2 - ...-frontend-checkin01.iad2.fedoraproject.org | 1 - .../ccd/mm-frontend01.iad2.fedoraproject.org | 1 - .../files/ccd/noc01.iad2.fedoraproject.org | 2 - .../files/ccd/noc01.rdu3.fedoraproject.org | 2 - .../server/files/ccd/noc02.fedoraproject.org | 2 - .../ccd/notifs-web01.iad2.fedoraproject.org | 2 - .../server/files/ccd/ns02.fedoraproject.org | 2 - .../server/files/ccd/ns05.fedoraproject.org | 2 - .../files/ccd/ns13.rdu2.fedoraproject.org | 1 - .../ccd/nuancier01.iad2.fedoraproject.org | 2 - .../ccd/nuancier02.iad2.fedoraproject.org | 2 - ...andidate-registry01.iad2.fedoraproject.org | 2 - .../ccd/oci-registry01.iad2.fedoraproject.org | 2 - .../ccd/oci-registry02.iad2.fedoraproject.org | 2 - .../odcs-frontend01.iad2.fedoraproject.org | 2 - .../files/ccd/openqa01.iad2.fedoraproject.org | 3 - .../ccd/os-master01.iad2.fedoraproject.org | 2 - .../ccd/os-master02.iad2.fedoraproject.org | 2 - .../ccd/os-master03.iad2.fedoraproject.org | 2 - .../ccd/os-node01.iad2.fedoraproject.org | 2 - .../ccd/os-node02.iad2.fedoraproject.org | 2 - .../ccd/os-node03.iad2.fedoraproject.org | 2 - .../ccd/os-node04.iad2.fedoraproject.org | 2 - .../ccd/os-node05.iad2.fedoraproject.org | 2 - .../ccd/osbs-master01.iad2.fedoraproject.org | 2 - .../files/ccd/osuosl01.fedoraproject.org | 2 - .../files/ccd/osuosl02.fedoraproject.org | 2 - .../files/ccd/pagure-stg01.fedoraproject.org | 1 - .../files/ccd/pagure01.fedoraproject.org | 1 - .../files/ccd/pagure02.fedoraproject.org | 1 - .../ccd/pdc-web01.iad2.fedoraproject.org | 2 - .../ccd/pdc-web02.iad2.fedoraproject.org | 2 - .../files/ccd/people01.fedoraproject.org | 2 - .../files/ccd/people02.fedoraproject.org | 2 - .../ccd/ppc64le-test.fedorainfracloud.org | 2 - .../ccd/ppc64le-test02.fedorainfracloud.org | 2 - .../files/ccd/proxy01.iad2.fedoraproject.org | 2 - .../files/ccd/proxy01.rdu3.fedoraproject.org | 2 - .../files/ccd/proxy02.fedoraproject.org | 2 - .../files/ccd/proxy03.fedoraproject.org | 2 - .../files/ccd/proxy04.fedoraproject.org | 2 - .../files/ccd/proxy05.fedoraproject.org | 2 - .../files/ccd/proxy06.fedoraproject.org | 2 - .../files/ccd/proxy09.fedoraproject.org | 1 - .../files/ccd/proxy10.iad2.fedoraproject.org | 2 - .../files/ccd/proxy101.iad2.fedoraproject.org | 2 - .../files/ccd/proxy11.fedoraproject.org | 2 - .../files/ccd/proxy110.iad2.fedoraproject.org | 2 - .../files/ccd/proxy12.fedoraproject.org | 2 - .../files/ccd/proxy13.fedoraproject.org | 2 - .../files/ccd/proxy14.fedoraproject.org | 2 - .../files/ccd/proxy30.fedoraproject.org | 2 - .../files/ccd/proxy31.fedoraproject.org | 2 - .../files/ccd/proxy32.fedoraproject.org | 2 - .../files/ccd/proxy33.fedoraproject.org | 2 - .../files/ccd/proxy34.fedoraproject.org | 2 - .../files/ccd/proxy35.fedoraproject.org | 2 - .../files/ccd/proxy36.fedoraproject.org | 2 - .../files/ccd/proxy37.fedoraproject.org | 3 - .../files/ccd/proxy38.fedoraproject.org | 3 - .../files/ccd/proxy39.fedoraproject.org | 3 - .../files/ccd/proxy40.fedoraproject.org | 3 - .../ccd/rawhide-test.fedorainfracloud.org | 2 - .../ccd/resultsdb01.iad2.fedoraproject.org | 2 - .../ccd/retrace03.rdu-cc.fedoraproject.org | 2 - .../ccd/smtp-auth-cc-rdu01.fedoraproject.org | 2 - .../ccd/smtp-mm-cc-rdu01.fedoraproject.org | 2 - .../files/ccd/smtp-mm-ib01.fedoraproject.org | 2 - .../ccd/smtp-mm-osuosl01.fedoraproject.org | 2 - .../ccd/storinator01.rdu-cc.fedoraproject.org | 2 - .../ccd/sundries01.iad2.fedoraproject.org | 2 - .../ccd/sundries02.iad2.fedoraproject.org | 2 - .../files/ccd/torrent01.fedoraproject.org | 2 - .../files/ccd/torrent02.fedoraproject.org | 2 - .../ccd/unbound-cc-rdu01.fedoraproject.org | 1 - .../files/ccd/unbound-ib01.fedoraproject.org | 1 - .../ccd/unbound-osuosl01.fedoraproject.org | 2 - .../files/ccd/value01.iad2.fedoraproject.org | 2 - .../files/ccd/value02.iad2.fedoraproject.org | 2 - .../ccd/virthost-cc-rdu01.fedoraproject.org | 2 - .../ccd/virthost-cc-rdu02.fedoraproject.org | 2 - .../ccd/virthost-cc-rdu03.fedoraproject.org | 2 - .../vmhost-a64-cc01.rdu-cc.fedoraproject.org | 2 - ...vmhost-p08-copr01.rdu-cc.fedoraproject.org | 2 - ...vmhost-p08-copr02.rdu-cc.fedoraproject.org | 2 - ...host-x86-cc-rdu05.rdu-cc.fedoraproject.org | 2 - ...host-x86-cc-rdu06.rdu-cc.fedoraproject.org | 2 - .../vmhost-x86-cc01.rdu-cc.fedoraproject.org | 2 - ...vmhost-x86-copr01.rdu-cc.fedoraproject.org | 2 - ...vmhost-x86-copr02.rdu-cc.fedoraproject.org | 2 - ...vmhost-x86-copr03.rdu-cc.fedoraproject.org | 2 - ...vmhost-x86-copr04.rdu-cc.fedoraproject.org | 2 - .../files/ccd/wiki01.iad2.fedoraproject.org | 2 - .../files/ccd/wiki02.iad2.fedoraproject.org | 2 - .../ccd/worker01.ocp.iad2.fedoraproject.org | 2 - .../ccd/worker01.ocp.rdu3.fedoraproject.org | 2 - .../ccd/worker02.ocp.iad2.fedoraproject.org | 2 - .../ccd/worker02.ocp.rdu3.fedoraproject.org | 2 - .../ccd/worker03.ocp.iad2.fedoraproject.org | 2 - .../ccd/worker03.ocp.rdu3.fedoraproject.org | 2 - .../ccd/worker04.ocp.iad2.fedoraproject.org | 2 - .../ccd/worker04.ocp.rdu3.fedoraproject.org | 2 - .../ccd/worker05.ocp.iad2.fedoraproject.org | 2 - .../ccd/worker05.ocp.rdu3.fedoraproject.org | 2 - .../ccd/worker06.ocp.iad2.fedoraproject.org | 2 - .../files/ccd/zabbix01.iad2.fedoraproject.org | 2 - roles/openvpn/server/tasks/main.yml | 9 - roles/people/templates/sssd.conf | 2 +- roles/postgresql_server/files/pg_hba.conf | 2 +- roles/postgresql_server/tasks/main.yml | 10 +- roles/rabbitmq_cluster/tasks/main.yml | 12 - roles/releng/tasks/main.yml | 18 +- roles/releng/templates/cloud-updates.j2 | 2 +- roles/releng/templates/container-updates.j2 | 2 +- roles/releng/templates/rawhide.j2 | 2 +- roles/releng/templates/sig_policy.j2 | 2 +- .../robosignatory/files/sigul.production.conf | 4 +- roles/rsyncd/files/rsyncd.conf.crawler | 4 +- roles/rsyncd/files/rsyncd.conf.default | 2 +- .../rsyncd.conf.people01.fedoraproject.org | 2 +- roles/rsyncd/files/rsyncd.conf.sundries | 44 +- roles/rsyncd/files/rsyncd.conf.sundries-stg | 44 +- .../rsyncd/templates/rsyncd.conf.download.j2 | 4 +- roles/sigul/bridge/templates/bridge.conf.j2 | 2 +- roles/sigul/server/templates/server.conf.j2 | 6 +- roles/supybot/files/ursabot.service | 2 +- roles/supybot/files/zodbot.service | 2 +- ...lt.cloud-noc-os01.rdu-cc.fedoraproject.org | 6 +- .../default.noc-cc01.rdu-cc.fedoraproject.org | 6 +- .../default.noc01.iad2.fedoraproject.org | 37 - .../default.noc01.rdu3.fedoraproject.org | 10 +- roles/tftp_server/tasks/main.yml | 6 +- roles/varnish/templates/proxies.vcl.j2 | 8 +- .../templates/sync-http-logs.yaml.j2 | 54 +- scripts/drac-xml-writer/dhcp_parser.py | 2 +- scripts/public-db-copy | 1 - 833 files changed, 986 insertions(+), 14381 deletions(-) delete mode 100644 inventory/group_vars/download_iad2 delete mode 100644 inventory/group_vars/iad2_production delete mode 100644 inventory/group_vars/iad2_staging delete mode 100644 inventory/host_vars/autosign01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/autosign01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/autosign02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/backup01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bastion01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bastion02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/batcave01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bkernel01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bkernel02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bootstrap.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bootstrap.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-28.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-29.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-30.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-34.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-35.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-36.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-37.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-38.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-39.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-a64-40.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-01.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-02.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-03.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-04.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-05.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-06.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-07.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-08.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-09.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-10.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-11.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-12.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-13.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-14.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-15.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-16.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-17.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-18.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-19.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-20.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-21.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-22.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-23.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-24.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-25.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-26.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-27.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-28.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-29.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-30.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-31.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-32.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-33.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-34.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-35.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-36.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-37.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-38.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-39.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-rdu3-40.rdu3.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-04.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-05.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-07.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-08.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-09.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-10.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-11.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-12.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-13.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-14.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-15.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-16.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-17.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-18.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-19.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-20.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-21.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-22.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-23.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-24.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-25.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-26.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-27.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-28.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-29.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-30.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-31.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-32.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-riscv01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-x86-riscv02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/busgateway01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/bvmhost-x86-riscv01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/centos-ipa-client01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/centos-ipa-client02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/centos-ipa-client03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/centos-ipa-client04.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/certgetter01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/compose-branched01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/compose-eln01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/compose-iot01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/compose-x86-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/compose-x86-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/data-reports01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-datanommer01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-datanommer02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-fas01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-fas01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-koji01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-openqa01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/debuginfod01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/dl01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/dl02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/dl03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/dl04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/dl05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/flatpak-cache01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/github2fedmsg01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipa01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipa01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipa02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipa02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipa03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipa03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipsilon01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ipsilon02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/kernel01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/kernel02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/koji01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/koji01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/koji02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/kojipkgs01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/kojipkgs02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/log01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/mailman01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/mailman01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/memcached02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/memcached02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/noc01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ns01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ns02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-candidate-registry01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-registry01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-registry02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ocp01.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ocp02.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ocp03.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-a64-worker05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-a64-worker06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/openqa01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/os-control01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/os-control01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/pkgs01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/proxy01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/proxy01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/proxy02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/proxy10.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/proxy101.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/proxy110.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/qvmhost-x86-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/rabbitmq01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/rabbitmq02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/rabbitmq03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/secondary01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sign-bridge01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sign-bridge01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sign-vault01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sign-vault01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sign-vault02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sundries01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sundries01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sundries02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/sundries02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/tang01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/tang02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/value02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/value02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-03.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-05.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-06.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-07.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-08.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/wiki01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/wiki01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/wiki02.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker01.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker02.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker03.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker04.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker04.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker05.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker05.ocp.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/worker06.ocp.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/zabbix01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/zabbix01.stg.iad2.fedoraproject.org delete mode 100644 roles/base/files/postfix/main.cf/main.cf.iad2 delete mode 100644 roles/base/files/postfix/main.cf/main.cf.kojibuilder_iad2 rename roles/base/files/postfix/main.cf/{main.cf.mailman01.stg.iad2.fedoraproject.org => main.cf.mailman01.stg.rdu3.fedoraproject.org} (99%) delete mode 100644 roles/base/files/rsyslog/rsyslog.conf.log01.iad2.fedoraproject.org delete mode 100644 roles/base/files/setprodiad2ps1.sh delete mode 100644 roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org delete mode 100644 roles/haproxy/files/ipa.production-iad2.pem delete mode 100644 roles/haproxy/files/ipa.staging-iad2.pem delete mode 100644 roles/haproxy/files/ocp.prod-iad2.pem delete mode 100644 roles/haproxy/files/ocp.stg-iad2.pem delete mode 100644 roles/haproxy/files/os-master.production-iad2.pem delete mode 100644 roles/haproxy/files/os-master.staging-iad2.pem delete mode 100644 roles/hosts/files/bastion01.iad2.fedoraproject.org-hosts delete mode 100644 roles/hosts/files/koji01.stg.iad2.fedoraproject.org-hosts delete mode 100644 roles/hosts/files/proxy01.iad2.fedoraproject.org-hosts delete mode 100644 roles/hosts/files/proxy10.iad2.fedoraproject.org-hosts delete mode 100644 roles/hosts/files/proxy101.iad2.fedoraproject.org-hosts delete mode 100644 roles/hosts/files/proxy110.iad2.fedoraproject.org-hosts delete mode 100644 roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 delete mode 100644 roles/iscsi_client/files/multipath.conf delete mode 100644 roles/iscsi_client/tasks/main.yml delete mode 100644 roles/iscsi_client/templates/initiatorname.iscsi.j2 delete mode 100644 roles/iscsi_client/vars/main.yml delete mode 100644 roles/mariadb_server/files/my.cnf.db-qa01.iad2.fedoraproject.org rename roles/nagios_server/files/nagios/servicegroups/{iad2-mgmt-http.cfg => rdu3-mgmt-http.cfg} (100%) delete mode 100644 roles/nagios_server/files/nagios/services/iad2_internal/basset.cfg delete mode 100644 roles/nagios_server/files/nagios/services/iad2_internal/certgetter.cfg create mode 100644 roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg create mode 100644 roles/nagios_server/files/nagios/services/rdu3_internal/certgetter.cfg rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/db_backups.cfg (79%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/disk.cfg (77%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/fedora_messaging.cfg (78%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/file_age.cfg (87%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/koji.cfg (80%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/locking.cfg (74%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/mailman.cfg (76%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/nrpe.cfg (56%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/pgsql.cfg (72%) rename roles/nagios_server/files/nagios/services/{iad2_internal => rdu3_internal}/rabbitmq.cfg (76%) delete mode 100644 roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/hosts/iad2-external.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/hosts/iad2-hosts.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/hosts/iad2-mgmt-hosts.cfg.j2 rename roles/nagios_server/templates/nagios/services/{iad2-mgmt.cfg.j2 => rdu3-mgmt.cfg.j2} (89%) delete mode 100644 roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports create mode 100644 roles/nfs/server/files/koji01.rdu3.fedoraproject.org-exports delete mode 100644 roles/nfs/server/files/koji01.stg.iad2.fedoraproject.org-exports delete mode 100644 roles/nfs/server/files/koji02.iad2.fedoraproject.org-exports create mode 100644 roles/nfs/server/files/koji02.rdu3.fedoraproject.org-exports delete mode 100644 roles/openvpn/server/files/ccd/aarch64-test01.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/badges-backend01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/badges-web01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/certgetter01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/certgetter01.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/cloud-noc-os01.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/coloamer01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/datagrepper02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/debuginfod01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/dedicatedsolutions01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/download-cc-rdu01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/download-ib01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/download-ib02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/download-rdu01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/el7-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/el8-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/el9-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/f32-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/f33-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/f36-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/f38-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/f39-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/fedocal01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/fedocal02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/host1plus01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ibiblio02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ibiblio05.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/internetx01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/internetx02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ipa03.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ipsilon01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ipsilon02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/mailman02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/noc01.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/noc02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ns02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ns05.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ns13.rdu2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/nuancier01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/nuancier02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/oci-registry02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/osuosl01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/osuosl02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/pagure-stg01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/pagure01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/pagure02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/pdc-web02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/people01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/people02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/ppc64le-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/ppc64le-test02.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy01.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy03.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy04.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy05.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy06.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy09.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy101.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy11.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy110.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy12.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy13.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy14.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy30.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy31.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy32.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy33.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy34.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy35.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy36.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy37.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy38.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy39.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/proxy40.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/rawhide-test.fedorainfracloud.org delete mode 100644 roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/retrace03.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/smtp-auth-cc-rdu01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/smtp-mm-cc-rdu01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/smtp-mm-ib01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/smtp-mm-osuosl01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/storinator01.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/sundries02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/torrent01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/torrent02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/unbound-cc-rdu01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/unbound-ib01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/unbound-osuosl01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/value02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/virthost-cc-rdu01.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/virthost-cc-rdu02.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/virthost-cc-rdu03.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-a64-cc01.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-p08-copr01.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-p08-copr02.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu05.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu06.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-cc01.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-copr01.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-copr02.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-copr03.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/vmhost-x86-copr04.rdu-cc.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/wiki02.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker01.ocp.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker01.ocp.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker02.ocp.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker02.ocp.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker03.ocp.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker03.ocp.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker04.ocp.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker04.ocp.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker05.ocp.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker05.ocp.rdu3.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/worker06.ocp.iad2.fedoraproject.org delete mode 100644 roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org delete mode 100644 roles/tftp_server/files/default.noc01.iad2.fedoraproject.org diff --git a/inventory/backups b/inventory/backups index f00d329c53..9e61899040 100644 --- a/inventory/backups +++ b/inventory/backups @@ -4,17 +4,17 @@ [backup_clients] copr-fe.aws.fedoraproject.org copr-keygen.aws.fedoraproject.org -db01.iad2.fedoraproject.org -db03.iad2.fedoraproject.org -db-datanommer02.iad2.fedoraproject.org -db-fas01.iad2.fedoraproject.org -batcave01.iad2.fedoraproject.org +db01.rdu3.fedoraproject.org +db03.rdu3.fedoraproject.org +db-datanommer02.rdu3.fedoraproject.org +db-fas01.rdu3.fedoraproject.org +batcave01.rdu3.fedoraproject.org pagure02.fedoraproject.org people01.fedoraproject.org -pkgs01.iad2.fedoraproject.org -log01.iad2.fedoraproject.org -db-openqa01.iad2.fedoraproject.org -db-koji01.iad2.fedoraproject.org -value02.iad2.fedoraproject.org -tang01.iad2.fedoraproject.org -ipa01.iad2.fedoraproject.org +pkgs01.rdu3.fedoraproject.org +log01.rdu3.fedoraproject.org +db-openqa01.rdu3.fedoraproject.org +db-koji01.rdu3.fedoraproject.org +value02.rdu3.fedoraproject.org +tang01.rdu3.fedoraproject.org +ipa01.rdu3.fedoraproject.org diff --git a/inventory/builders b/inventory/builders index 112f620af0..0fab685b1c 100644 --- a/inventory/builders +++ b/inventory/builders @@ -1,36 +1,4 @@ [buildvm] -buildvm-x86-01.iad2.fedoraproject.org -buildvm-x86-02.iad2.fedoraproject.org -buildvm-x86-03.iad2.fedoraproject.org -buildvm-x86-04.iad2.fedoraproject.org -buildvm-x86-05.iad2.fedoraproject.org -buildvm-x86-06.iad2.fedoraproject.org -buildvm-x86-07.iad2.fedoraproject.org -buildvm-x86-08.iad2.fedoraproject.org -buildvm-x86-09.iad2.fedoraproject.org -buildvm-x86-10.iad2.fedoraproject.org -buildvm-x86-11.iad2.fedoraproject.org -buildvm-x86-12.iad2.fedoraproject.org -buildvm-x86-13.iad2.fedoraproject.org -buildvm-x86-14.iad2.fedoraproject.org -buildvm-x86-15.iad2.fedoraproject.org -buildvm-x86-16.iad2.fedoraproject.org -buildvm-x86-17.iad2.fedoraproject.org -buildvm-x86-18.iad2.fedoraproject.org -buildvm-x86-19.iad2.fedoraproject.org -buildvm-x86-20.iad2.fedoraproject.org -buildvm-x86-21.iad2.fedoraproject.org -buildvm-x86-22.iad2.fedoraproject.org -buildvm-x86-23.iad2.fedoraproject.org -buildvm-x86-24.iad2.fedoraproject.org -buildvm-x86-25.iad2.fedoraproject.org -buildvm-x86-26.iad2.fedoraproject.org -buildvm-x86-27.iad2.fedoraproject.org -buildvm-x86-28.iad2.fedoraproject.org -buildvm-x86-29.iad2.fedoraproject.org -buildvm-x86-30.iad2.fedoraproject.org -buildvm-x86-31.iad2.fedoraproject.org -buildvm-x86-32.iad2.fedoraproject.org buildvm-x86-01.rdu3.fedoraproject.org buildvm-x86-02.rdu3.fedoraproject.org buildvm-x86-03.rdu3.fedoraproject.org @@ -64,40 +32,6 @@ buildvm-x86-30.rdu3.fedoraproject.org buildvm-x86-31.rdu3.fedoraproject.org buildvm-x86-32.rdu3.fedoraproject.org -[buildvm_iad2] -buildvm-x86-01.iad2.fedoraproject.org -buildvm-x86-02.iad2.fedoraproject.org -buildvm-x86-03.iad2.fedoraproject.org -buildvm-x86-04.iad2.fedoraproject.org -buildvm-x86-05.iad2.fedoraproject.org -buildvm-x86-06.iad2.fedoraproject.org -buildvm-x86-07.iad2.fedoraproject.org -buildvm-x86-08.iad2.fedoraproject.org -buildvm-x86-09.iad2.fedoraproject.org -buildvm-x86-10.iad2.fedoraproject.org -buildvm-x86-11.iad2.fedoraproject.org -buildvm-x86-12.iad2.fedoraproject.org -buildvm-x86-13.iad2.fedoraproject.org -buildvm-x86-14.iad2.fedoraproject.org -buildvm-x86-15.iad2.fedoraproject.org -buildvm-x86-16.iad2.fedoraproject.org -buildvm-x86-17.iad2.fedoraproject.org -buildvm-x86-18.iad2.fedoraproject.org -buildvm-x86-19.iad2.fedoraproject.org -buildvm-x86-20.iad2.fedoraproject.org -buildvm-x86-21.iad2.fedoraproject.org -buildvm-x86-22.iad2.fedoraproject.org -buildvm-x86-23.iad2.fedoraproject.org -buildvm-x86-24.iad2.fedoraproject.org -buildvm-x86-25.iad2.fedoraproject.org -buildvm-x86-26.iad2.fedoraproject.org -buildvm-x86-27.iad2.fedoraproject.org -buildvm-x86-28.iad2.fedoraproject.org -buildvm-x86-29.iad2.fedoraproject.org -buildvm-x86-30.iad2.fedoraproject.org -buildvm-x86-31.iad2.fedoraproject.org -buildvm-x86-32.iad2.fedoraproject.org - [buildvm_rdu3] buildvm-x86-01.rdu3.fedoraproject.org buildvm-x86-02.rdu3.fedoraproject.org @@ -133,24 +67,12 @@ buildvm-x86-31.rdu3.fedoraproject.org buildvm-x86-32.rdu3.fedoraproject.org [buildvm_stg] -buildvm-x86-01.stg.iad2.fedoraproject.org -buildvm-x86-02.stg.iad2.fedoraproject.org -buildvm-x86-03.stg.iad2.fedoraproject.org -buildvm-x86-04.stg.iad2.fedoraproject.org -buildvm-x86-05.stg.iad2.fedoraproject.org buildvm-x86-01.stg.rdu3.fedoraproject.org buildvm-x86-02.stg.rdu3.fedoraproject.org buildvm-x86-03.stg.rdu3.fedoraproject.org buildvm-x86-04.stg.rdu3.fedoraproject.org buildvm-x86-05.stg.rdu3.fedoraproject.org -[buildvm_stg_iad2] -buildvm-x86-01.stg.iad2.fedoraproject.org -buildvm-x86-02.stg.iad2.fedoraproject.org -buildvm-x86-03.stg.iad2.fedoraproject.org -buildvm-x86-04.stg.iad2.fedoraproject.org -buildvm-x86-05.stg.iad2.fedoraproject.org - [buildvm_stg_rdu3] buildvm-x86-01.stg.rdu3.fedoraproject.org buildvm-x86-02.stg.rdu3.fedoraproject.org @@ -159,79 +81,31 @@ buildvm-x86-04.stg.rdu3.fedoraproject.org buildvm-x86-05.stg.rdu3.fedoraproject.org [buildvm_aarch64_stg] -buildvm-a64-01.stg.iad2.fedoraproject.org -buildvm-a64-02.stg.iad2.fedoraproject.org -buildvm-a64-01.stg.iad2.fedoraproject.org -buildvm-a64-02.stg.iad2.fedoraproject.org - -[buildvm_aarch64_stg_iad2] -buildvm-a64-01.stg.iad2.fedoraproject.org -buildvm-a64-02.stg.iad2.fedoraproject.org +buildvm-a64-01.stg.rdu3.fedoraproject.org +buildvm-a64-02.stg.rdu3.fedoraproject.org [buildvm_aarch64_stg_rdu3] -buildvm-a64-01.stg.iad2.fedoraproject.org -buildvm-a64-02.stg.iad2.fedoraproject.org +buildvm-a64-01.stg.rdu3.fedoraproject.org +buildvm-a64-02.stg.rdu3.fedoraproject.org [buildvm_s390x_stg] buildvm-s390x-01.stg.s390.fedoraproject.org [buildvm_ppc64le_stg] -buildvm-ppc64le-01.stg.iad2.fedoraproject.org -buildvm-ppc64le-02.stg.iad2.fedoraproject.org -buildvm-ppc64le-03.stg.iad2.fedoraproject.org -buildvm-ppc64le-04.stg.iad2.fedoraproject.org -buildvm-ppc64le-05.stg.iad2.fedoraproject.org - -[buildvm_ppc64le_stg_iad2] -buildvm-ppc64le-01.stg.iad2.fedoraproject.org -buildvm-ppc64le-02.stg.iad2.fedoraproject.org -buildvm-ppc64le-03.stg.iad2.fedoraproject.org -buildvm-ppc64le-04.stg.iad2.fedoraproject.org -buildvm-ppc64le-05.stg.iad2.fedoraproject.org +buildvm-ppc64le-01.stg.rdu3.fedoraproject.org +buildvm-ppc64le-02.stg.rdu3.fedoraproject.org +buildvm-ppc64le-03.stg.rdu3.fedoraproject.org +buildvm-ppc64le-04.stg.rdu3.fedoraproject.org +buildvm-ppc64le-05.stg.rdu3.fedoraproject.org [buildvm_ppc64le_stg_rdu3] +buildvm-ppc64le-01.stg.rdu3.fedoraproject.org +buildvm-ppc64le-02.stg.rdu3.fedoraproject.org +buildvm-ppc64le-03.stg.rdu3.fedoraproject.org +buildvm-ppc64le-04.stg.rdu3.fedoraproject.org +buildvm-ppc64le-05.stg.rdu3.fedoraproject.org [buildvm_aarch64] -buildvm-a64-01.iad2.fedoraproject.org -buildvm-a64-02.iad2.fedoraproject.org -buildvm-a64-03.iad2.fedoraproject.org -buildvm-a64-04.iad2.fedoraproject.org -buildvm-a64-05.iad2.fedoraproject.org -buildvm-a64-06.iad2.fedoraproject.org -buildvm-a64-07.iad2.fedoraproject.org -buildvm-a64-08.iad2.fedoraproject.org -buildvm-a64-09.iad2.fedoraproject.org -buildvm-a64-10.iad2.fedoraproject.org -buildvm-a64-11.iad2.fedoraproject.org -buildvm-a64-12.iad2.fedoraproject.org -buildvm-a64-13.iad2.fedoraproject.org -buildvm-a64-14.iad2.fedoraproject.org -buildvm-a64-15.iad2.fedoraproject.org -buildvm-a64-16.iad2.fedoraproject.org -buildvm-a64-17.iad2.fedoraproject.org -buildvm-a64-18.iad2.fedoraproject.org -buildvm-a64-19.iad2.fedoraproject.org -buildvm-a64-20.iad2.fedoraproject.org -buildvm-a64-21.iad2.fedoraproject.org -buildvm-a64-22.iad2.fedoraproject.org -buildvm-a64-23.iad2.fedoraproject.org -buildvm-a64-24.iad2.fedoraproject.org -buildvm-a64-25.iad2.fedoraproject.org -buildvm-a64-26.iad2.fedoraproject.org -buildvm-a64-27.iad2.fedoraproject.org -buildvm-a64-28.iad2.fedoraproject.org -buildvm-a64-29.iad2.fedoraproject.org -buildvm-a64-30.iad2.fedoraproject.org -buildvm-a64-31.iad2.fedoraproject.org -buildvm-a64-32.iad2.fedoraproject.org -buildvm-a64-33.iad2.fedoraproject.org -buildvm-a64-34.iad2.fedoraproject.org -buildvm-a64-35.iad2.fedoraproject.org -buildvm-a64-36.iad2.fedoraproject.org -buildvm-a64-37.iad2.fedoraproject.org -buildvm-a64-38.iad2.fedoraproject.org -buildvm-a64-39.iad2.fedoraproject.org -buildvm-a64-40.iad2.fedoraproject.org buildvm-a64-01.rdu3.fedoraproject.org buildvm-a64-02.rdu3.fedoraproject.org buildvm-a64-03.rdu3.fedoraproject.org @@ -273,48 +147,6 @@ buildvm-a64-38.rdu3.fedoraproject.org buildvm-a64-39.rdu3.fedoraproject.org buildvm-a64-40.rdu3.fedoraproject.org -[buildvm_aarch64_iad2] -buildvm-a64-01.iad2.fedoraproject.org -buildvm-a64-02.iad2.fedoraproject.org -buildvm-a64-03.iad2.fedoraproject.org -buildvm-a64-04.iad2.fedoraproject.org -buildvm-a64-05.iad2.fedoraproject.org -buildvm-a64-06.iad2.fedoraproject.org -buildvm-a64-07.iad2.fedoraproject.org -buildvm-a64-08.iad2.fedoraproject.org -buildvm-a64-09.iad2.fedoraproject.org -buildvm-a64-10.iad2.fedoraproject.org -buildvm-a64-11.iad2.fedoraproject.org -buildvm-a64-12.iad2.fedoraproject.org -buildvm-a64-13.iad2.fedoraproject.org -buildvm-a64-14.iad2.fedoraproject.org -buildvm-a64-15.iad2.fedoraproject.org -buildvm-a64-16.iad2.fedoraproject.org -buildvm-a64-17.iad2.fedoraproject.org -buildvm-a64-18.iad2.fedoraproject.org -buildvm-a64-19.iad2.fedoraproject.org -buildvm-a64-20.iad2.fedoraproject.org -buildvm-a64-21.iad2.fedoraproject.org -buildvm-a64-22.iad2.fedoraproject.org -buildvm-a64-23.iad2.fedoraproject.org -buildvm-a64-24.iad2.fedoraproject.org -buildvm-a64-25.iad2.fedoraproject.org -buildvm-a64-26.iad2.fedoraproject.org -buildvm-a64-27.iad2.fedoraproject.org -buildvm-a64-28.iad2.fedoraproject.org -buildvm-a64-29.iad2.fedoraproject.org -buildvm-a64-30.iad2.fedoraproject.org -buildvm-a64-31.iad2.fedoraproject.org -buildvm-a64-32.iad2.fedoraproject.org -buildvm-a64-33.iad2.fedoraproject.org -buildvm-a64-34.iad2.fedoraproject.org -buildvm-a64-35.iad2.fedoraproject.org -buildvm-a64-36.iad2.fedoraproject.org -buildvm-a64-37.iad2.fedoraproject.org -buildvm-a64-38.iad2.fedoraproject.org -buildvm-a64-39.iad2.fedoraproject.org -buildvm-a64-40.iad2.fedoraproject.org - [buildvm_aarch64_rdu3] buildvm-a64-01.rdu3.fedoraproject.org buildvm-a64-02.rdu3.fedoraproject.org @@ -387,111 +219,52 @@ bvmhost-s390x-01.s390.fedoraproject.org bvmhost-s390x-01.stg.s390.fedoraproject.org bvmhost-s390x-01.s390.fedoraproject.org # mt snow machines -bvmhost-a64-01.iad2.fedoraproject.org -bvmhost-a64-02.iad2.fedoraproject.org -bvmhost-a64-03.iad2.fedoraproject.org -bvmhost-a64-04.iad2.fedoraproject.org bvmhost-a64-01.rdu3.fedoraproject.org bvmhost-a64-02.rdu3.fedoraproject.org bvmhost-a64-03.rdu3.fedoraproject.org bvmhost-a64-04.rdu3.fedoraproject.org -# These are lenovo emags in IAD2 -bvmhost-a64-01.stg.iad2.fedoraproject.org +# These are lenovo emags in RDU3 bvmhost-a64-01.stg.rdu3.fedoraproject.org # ppc -bvmhost-p09-01.iad2.fedoraproject.org -bvmhost-p09-02.iad2.fedoraproject.org -bvmhost-p09-03.iad2.fedoraproject.org -bvmhost-p09-04.iad2.fedoraproject.org -bvmhost-p09-05.iad2.fedoraproject.org -bvmhost-p09-01.stg.iad2.fedoraproject.org +bvmhost-p09-01.rdu3.fedoraproject.org +bvmhost-p09-02.rdu3.fedoraproject.org +bvmhost-p09-03.rdu3.fedoraproject.org +bvmhost-p09-04.rdu3.fedoraproject.org +bvmhost-p09-05.rdu3.fedoraproject.org +bvmhost-p09-01.stg.rdu3.fedoraproject.org bvmhost-p10-01.rdu3.fedoraproject.org -[buildvmhost_iad2] -# mt snow machines -bvmhost-a64-01.iad2.fedoraproject.org -bvmhost-a64-02.iad2.fedoraproject.org -bvmhost-a64-03.iad2.fedoraproject.org -bvmhost-a64-04.iad2.fedoraproject.org -# These are lenovo emags in IAD2 -bvmhost-a64-01.stg.iad2.fedoraproject.org -# ppc -bvmhost-p09-01.iad2.fedoraproject.org -bvmhost-p09-02.iad2.fedoraproject.org -bvmhost-p09-03.iad2.fedoraproject.org -bvmhost-p09-04.iad2.fedoraproject.org -bvmhost-p09-05.iad2.fedoraproject.org -bvmhost-p09-01.stg.iad2.fedoraproject.org - [buildvmhost_rdu3] -bvmhost-p10-01.rdu3.fedoraproject.org +# mt snow machines bvmhost-a64-01.rdu3.fedoraproject.org bvmhost-a64-02.rdu3.fedoraproject.org bvmhost-a64-03.rdu3.fedoraproject.org bvmhost-a64-04.rdu3.fedoraproject.org - -[buildvmhost_stg_iad2] -bvmhost-a64-01.stg.iad2.fedoraproject.org -bvmhost-p09-01.stg.iad2.fedoraproject.org +# These are lenovo emags in RDU3 +bvmhost-a64-01.stg.rdu3.fedoraproject.org +# ppc +bvmhost-p09-01.rdu3.fedoraproject.org +bvmhost-p09-02.rdu3.fedoraproject.org +bvmhost-p09-03.rdu3.fedoraproject.org +bvmhost-p09-04.rdu3.fedoraproject.org +bvmhost-p09-05.rdu3.fedoraproject.org +bvmhost-p09-01.stg.rdu3.fedoraproject.org [buildvmhost_stg_rdu3] bvmhost-a64-01.stg.rdu3.fedoraproject.org +bvmhost-p09-01.stg.rdu3.fedoraproject.org [buildhw] # mt snow buildhw-a64-01.rdu3.fedoraproject.org buildhw-a64-02.rdu3.fedoraproject.org -buildhw-a64-03.iad2.fedoraproject.org -buildhw-a64-04.iad2.fedoraproject.org -buildhw-a64-05.iad2.fedoraproject.org -buildhw-a64-06.iad2.fedoraproject.org -buildhw-x86-01.iad2.fedoraproject.org -buildhw-x86-02.iad2.fedoraproject.org -buildhw-x86-03.iad2.fedoraproject.org -buildhw-x86-04.iad2.fedoraproject.org -buildhw-x86-05.iad2.fedoraproject.org -buildhw-x86-06.iad2.fedoraproject.org -buildhw-x86-07.iad2.fedoraproject.org -buildhw-x86-08.iad2.fedoraproject.org -buildhw-x86-09.iad2.fedoraproject.org -buildhw-x86-10.iad2.fedoraproject.org -buildhw-x86-11.iad2.fedoraproject.org -buildhw-x86-12.iad2.fedoraproject.org -buildhw-x86-13.iad2.fedoraproject.org -buildhw-x86-14.iad2.fedoraproject.org -buildhw-x86-15.iad2.fedoraproject.org -buildhw-x86-16.iad2.fedoraproject.org buildhw-x86-01.rdu3.fedoraproject.org buildhw-x86-02.rdu3.fedoraproject.org buildhw-x86-03.rdu3.fedoraproject.org -[buildhw_iad2] -# mt snow -buildhw-a64-03.iad2.fedoraproject.org -buildhw-a64-04.iad2.fedoraproject.org -buildhw-a64-05.iad2.fedoraproject.org -buildhw-a64-06.iad2.fedoraproject.org -# dell blades -buildhw-x86-01.iad2.fedoraproject.org -buildhw-x86-02.iad2.fedoraproject.org -buildhw-x86-03.iad2.fedoraproject.org -buildhw-x86-04.iad2.fedoraproject.org -buildhw-x86-05.iad2.fedoraproject.org -buildhw-x86-06.iad2.fedoraproject.org -buildhw-x86-07.iad2.fedoraproject.org -buildhw-x86-08.iad2.fedoraproject.org -buildhw-x86-09.iad2.fedoraproject.org -buildhw-x86-10.iad2.fedoraproject.org -buildhw-x86-11.iad2.fedoraproject.org -buildhw-x86-12.iad2.fedoraproject.org -buildhw-x86-13.iad2.fedoraproject.org -buildhw-x86-14.iad2.fedoraproject.org -buildhw-x86-15.iad2.fedoraproject.org -buildhw-x86-16.iad2.fedoraproject.org - [buildhw_rdu3] -buildhw-a64-01.rdu3.fedoraproject.org -buildhw-a64-02.rdu3.fedoraproject.org +# mt snow +# dell blades buildhw-x86-01.rdu3.fedoraproject.org buildhw-x86-02.rdu3.fedoraproject.org buildhw-x86-03.rdu3.fedoraproject.org @@ -500,39 +273,6 @@ buildhw-x86-03.rdu3.fedoraproject.org # These are primary koji builders. # [buildvm_ppc64le] -buildvm-ppc64le-01.iad2.fedoraproject.org -buildvm-ppc64le-02.iad2.fedoraproject.org -buildvm-ppc64le-03.iad2.fedoraproject.org -buildvm-ppc64le-04.iad2.fedoraproject.org -buildvm-ppc64le-05.iad2.fedoraproject.org -buildvm-ppc64le-06.iad2.fedoraproject.org -buildvm-ppc64le-07.iad2.fedoraproject.org -buildvm-ppc64le-08.iad2.fedoraproject.org -buildvm-ppc64le-09.iad2.fedoraproject.org -buildvm-ppc64le-10.iad2.fedoraproject.org -buildvm-ppc64le-11.iad2.fedoraproject.org -buildvm-ppc64le-12.iad2.fedoraproject.org -buildvm-ppc64le-13.iad2.fedoraproject.org -buildvm-ppc64le-14.iad2.fedoraproject.org -buildvm-ppc64le-15.iad2.fedoraproject.org -buildvm-ppc64le-16.iad2.fedoraproject.org -buildvm-ppc64le-17.iad2.fedoraproject.org -buildvm-ppc64le-18.iad2.fedoraproject.org -buildvm-ppc64le-19.iad2.fedoraproject.org -buildvm-ppc64le-20.iad2.fedoraproject.org -buildvm-ppc64le-21.iad2.fedoraproject.org -buildvm-ppc64le-22.iad2.fedoraproject.org -buildvm-ppc64le-23.iad2.fedoraproject.org -buildvm-ppc64le-24.iad2.fedoraproject.org -buildvm-ppc64le-25.iad2.fedoraproject.org -buildvm-ppc64le-26.iad2.fedoraproject.org -buildvm-ppc64le-27.iad2.fedoraproject.org -buildvm-ppc64le-28.iad2.fedoraproject.org -buildvm-ppc64le-29.iad2.fedoraproject.org -buildvm-ppc64le-30.iad2.fedoraproject.org -buildvm-ppc64le-31.iad2.fedoraproject.org -buildvm-ppc64le-32.iad2.fedoraproject.org -buildvm-ppc64le-33.iad2.fedoraproject.org buildvm-ppc64le-01.rdu3.fedoraproject.org buildvm-ppc64le-02.rdu3.fedoraproject.org buildvm-ppc64le-03.rdu3.fedoraproject.org @@ -566,41 +306,6 @@ buildvm-ppc64le-30.rdu3.fedoraproject.org buildvm-ppc64le-31.rdu3.fedoraproject.org buildvm-ppc64le-32.rdu3.fedoraproject.org -[buildvm_ppc64le_iad2] -buildvm-ppc64le-01.iad2.fedoraproject.org -buildvm-ppc64le-02.iad2.fedoraproject.org -buildvm-ppc64le-03.iad2.fedoraproject.org -buildvm-ppc64le-04.iad2.fedoraproject.org -buildvm-ppc64le-05.iad2.fedoraproject.org -buildvm-ppc64le-06.iad2.fedoraproject.org -buildvm-ppc64le-07.iad2.fedoraproject.org -buildvm-ppc64le-08.iad2.fedoraproject.org -buildvm-ppc64le-09.iad2.fedoraproject.org -buildvm-ppc64le-10.iad2.fedoraproject.org -buildvm-ppc64le-11.iad2.fedoraproject.org -buildvm-ppc64le-12.iad2.fedoraproject.org -buildvm-ppc64le-13.iad2.fedoraproject.org -buildvm-ppc64le-14.iad2.fedoraproject.org -buildvm-ppc64le-15.iad2.fedoraproject.org -buildvm-ppc64le-16.iad2.fedoraproject.org -buildvm-ppc64le-17.iad2.fedoraproject.org -buildvm-ppc64le-18.iad2.fedoraproject.org -buildvm-ppc64le-19.iad2.fedoraproject.org -buildvm-ppc64le-20.iad2.fedoraproject.org -buildvm-ppc64le-21.iad2.fedoraproject.org -buildvm-ppc64le-22.iad2.fedoraproject.org -buildvm-ppc64le-23.iad2.fedoraproject.org -buildvm-ppc64le-24.iad2.fedoraproject.org -buildvm-ppc64le-25.iad2.fedoraproject.org -buildvm-ppc64le-26.iad2.fedoraproject.org -buildvm-ppc64le-27.iad2.fedoraproject.org -buildvm-ppc64le-28.iad2.fedoraproject.org -buildvm-ppc64le-29.iad2.fedoraproject.org -buildvm-ppc64le-30.iad2.fedoraproject.org -buildvm-ppc64le-31.iad2.fedoraproject.org -buildvm-ppc64le-32.iad2.fedoraproject.org -buildvm-ppc64le-33.iad2.fedoraproject.org - [buildvm_ppc64le_rdu3] buildvm-ppc64le-01.rdu3.fedoraproject.org buildvm-ppc64le-02.rdu3.fedoraproject.org @@ -636,36 +341,26 @@ buildvm-ppc64le-31.rdu3.fedoraproject.org buildvm-ppc64le-32.rdu3.fedoraproject.org [bkernel] -bkernel01.iad2.fedoraproject.org -bkernel02.iad2.fedoraproject.org buildhw-x86-01.rdu3.fedoraproject.org # These hosts get the runroot plugin installed. # They should be added to their own 'compose' channel in the koji db # .. and they should not appear in the default channel for builds. [runroot] -buildvm-x86-01.iad2.fedoraproject.org -buildvm-x86-02.iad2.fedoraproject.org -buildvm-x86-03.iad2.fedoraproject.org -buildvm-a64-01.iad2.fedoraproject.org -buildvm-a64-02.iad2.fedoraproject.org -buildvm-a64-03.iad2.fedoraproject.org +buildvm-x86-01.rdu3.fedoraproject.org +buildvm-x86-02.rdu3.fedoraproject.org +buildvm-x86-03.rdu3.fedoraproject.org +buildvm-a64-01.rdu3.fedoraproject.org +buildvm-a64-02.rdu3.fedoraproject.org +buildvm-a64-03.rdu3.fedoraproject.org buildvm-ppc64le-01.rdu3.fedoraproject.org buildvm-ppc64le-02.rdu3.fedoraproject.org buildvm-ppc64le-03.rdu3.fedoraproject.org -buildvm-ppc64le-01.iad2.fedoraproject.org -buildvm-ppc64le-09.iad2.fedoraproject.org -buildvm-ppc64le-18.iad2.fedoraproject.org -buildvm-ppc64le-27.iad2.fedoraproject.org -buildvm-ppc64le-33.iad2.fedoraproject.org buildvm-s390x-11.s390.fedoraproject.org buildvm-s390x-12.s390.fedoraproject.org buildvm-s390x-13.s390.fedoraproject.org -buildvm-a64-01.stg.iad2.fedoraproject.org buildvm-a64-01.stg.rdu3.fedoraproject.org -buildvm-ppc64le-01.stg.iad2.fedoraproject.org buildvm-s390x-01.stg.s390.fedoraproject.org -buildvm-x86-01.stg.iad2.fedoraproject.org buildvm-x86-01.stg.rdu3.fedoraproject.org # These are builders in the osbuild channel. @@ -673,33 +368,12 @@ buildvm-x86-01.stg.rdu3.fedoraproject.org # a special ipset to allow them to talk to the osbuild # API endpoint. [osbuild] -buildhw-x86-01.iad2.fedoraproject.org -buildhw-x86-02.iad2.fedoraproject.org -buildhw-x86-03.iad2.fedoraproject.org -buildhw-x86-04.iad2.fedoraproject.org -buildhw-x86-05.iad2.fedoraproject.org -buildhw-x86-06.iad2.fedoraproject.org -buildhw-x86-07.iad2.fedoraproject.org -buildhw-x86-08.iad2.fedoraproject.org -buildhw-x86-09.iad2.fedoraproject.org -buildhw-x86-10.iad2.fedoraproject.org -buildhw-x86-11.iad2.fedoraproject.org -buildhw-x86-12.iad2.fedoraproject.org -buildhw-x86-13.iad2.fedoraproject.org -buildhw-x86-14.iad2.fedoraproject.org -buildhw-x86-15.iad2.fedoraproject.org -buildhw-x86-16.iad2.fedoraproject.org buildvm-x86-10.rdu3.fedoraproject.org buildvm-x86-11.rdu3.fedoraproject.org buildvm-x86-12.rdu3.fedoraproject.org buildvm-x86-13.rdu3.fedoraproject.org buildvm-x86-14.rdu3.fedoraproject.org buildvm-x86-15.rdu3.fedoraproject.org -buildvm-x86-01.stg.iad2.fedoraproject.org -buildvm-x86-02.stg.iad2.fedoraproject.org -buildvm-x86-03.stg.iad2.fedoraproject.org -buildvm-x86-04.stg.iad2.fedoraproject.org -buildvm-x86-05.stg.iad2.fedoraproject.org [buildvm_x86_riscv] buildvm-x86-riscv01.rdu3.fedoraproject.org @@ -709,17 +383,6 @@ buildvm-x86-riscv02.rdu3.fedoraproject.org buildvm-x86-riscv01.rdu3.fedoraproject.org buildvm-x86-riscv02.rdu3.fedoraproject.org -[builders_iad2:children] -buildvm_iad2 -buildvm_aarch64_iad2 -buildhw_iad2 -buildvm_ppc64le_iad2 - -[builders_iad2_stg:children] -buildvm_stg_iad2 -buildvm_aarch64_stg_iad2 -buildvm_ppc64le_stg_iad2 - [builders_rdu3:children] buildvm_rdu3 buildvm_aarch64_rdu3 @@ -727,11 +390,6 @@ buildhw_rdu3 buildvm_ppc64le_rdu3 buildvm_x86_riscv_rdu3 -[builders_iad2_stg:children] -buildvm_stg_iad2 -buildvm_aarch64_stg_iad2 -buildvm_ppc64le_stg_iad2 - [builders_rdu3_stg:children] buildvm_stg_rdu3 buildvm_aarch64_stg_rdu3 diff --git a/inventory/group_vars/all b/inventory/group_vars/all index f895960b87..ce67ae607e 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -87,7 +87,7 @@ createrepo: True # Groups and individual hosts should override them with specific info. custom6_rules: [] custom_rules: [] -# most of our systems are in IAD2 +# most of our systems are in RDU3 datacenter: rdu3 # Datanommer diff --git a/inventory/group_vars/autosign b/inventory/group_vars/autosign index 05d2675432..02cd91ccd1 100644 --- a/inventory/group_vars/autosign +++ b/inventory/group_vars/autosign @@ -9,8 +9,8 @@ ansible_ifcfg_allowlist: # Make connections from signing bridges stateless, they break sigul connections # https://bugzilla.redhat.com/show_bug.cgi?id=1283364 -custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.3.169.120 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.3.169.120 tcp sport 44334 counter accept'] +custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.16.169.120 -j ACCEPT'] +nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.16.169.120 tcp sport 44334 counter accept'] host_group: autosign ipa_client_shell_groups: - sysadmin-releng diff --git a/inventory/group_vars/autosign_hardware b/inventory/group_vars/autosign_hardware index e7d8154757..b4c54b6aeb 100644 --- a/inventory/group_vars/autosign_hardware +++ b/inventory/group_vars/autosign_hardware @@ -1,6 +1,6 @@ --- # Make connections from signing bridges stateless, they break sigul connections # https://bugzilla.redhat.com/show_bug.cgi?id=1283364 -custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.3.169.120 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.3.169.120 tcp sport 44334 counter accept'] +custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.16.169.120 -j ACCEPT'] +nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.16.169.120 tcp sport 44334 counter accept'] host_group: autosign diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion index a8d9506bbf..6aac9b1454 100644 --- a/inventory/group_vars/bastion +++ b/inventory/group_vars/bastion @@ -67,7 +67,7 @@ udp_ports: [1194] notes: | SSH proxy to access infrastructure not exposed to the web - * Provides ssh access to all iad2/vpn connected servers. + * Provides ssh access to all rdu3/vpn connected servers. * Bastion is the hub for all infrastructure's VPN connections. - * All incoming SMTP from iad2 and VPN, as well as outgoing SMTP, pass or are filtered here. + * All incoming SMTP from rdu3 and VPN, as well as outgoing SMTP, pass or are filtered here. * Bastion does not accept any mail outside phx2/vpn. diff --git a/inventory/group_vars/bastion_stg b/inventory/group_vars/bastion_stg index 2338bb77c0..f1d08f0366 100644 --- a/inventory/group_vars/bastion_stg +++ b/inventory/group_vars/bastion_stg @@ -50,7 +50,7 @@ udp_ports: [1194] notes: | SSH proxy to access STAGING infrastructure not exposed to the web - * Provides ssh access to all iad2/vpn connected servers. + * Provides ssh access to all rdu3/vpn connected servers. * Bastion is the hub for all infrastructure's VPN connections. - * All incoming SMTP from iad2 and VPN, as well as outgoing SMTP, pass or are filtered here. + * All incoming SMTP from rdu3 and VPN, as well as outgoing SMTP, pass or are filtered here. * Bastion does not accept any mail outside phx2/vpn. diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave index db84027b7e..dbd4ed0e6f 100644 --- a/inventory/group_vars/batcave +++ b/inventory/group_vars/batcave @@ -2,9 +2,9 @@ ansible_base: /srv/web/infra # For the MOTD # Neeed for rsync from log01 for logs. -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] +custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' # # This host is externally reachable diff --git a/inventory/group_vars/bodhi_backend_stg b/inventory/group_vars/bodhi_backend_stg index c2d638f82c..3a8266fd26 100644 --- a/inventory/group_vars/bodhi_backend_stg +++ b/inventory/group_vars/bodhi_backend_stg @@ -7,9 +7,9 @@ bodhi_message_routing_keys: # For the MOTD # Make connections from signing bridges stateless, they break sigul connections # https://bugzilla.redhat.com/show_bug.cgi?id=1283364 -# this is sign-bridge01.iad2 ip 10.3.169.120 -custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.3.169.120 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.3.169.120 tcp sport 44334 counter accept'] +# this is sign-bridge01.rdu3 ip 10.16.169.120 +custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.16.169.120 -j ACCEPT'] +nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.16.169.120 tcp sport 44334 counter accept'] host_group: bodhi2 ipa_client_shell_groups: - sysadmin-bodhi diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index e98179d82c..3af47eda4f 100644 --- a/inventory/group_vars/buildvm +++ b/inventory/group_vars/buildvm @@ -1,8 +1,8 @@ --- # common items for the buildvm-* koji builders -dns: 10.3.163.33 +dns: 10.16.163.33 docker_registry: "candidate-registry.fedoraproject.org" -eth0_ipv4_gw: 10.3.169.254 +eth0_ipv4_gw: 10.16.169.254 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64 index 80d3ffe11b..6887e207ad 100644 --- a/inventory/group_vars/buildvm_aarch64 +++ b/inventory/group_vars/buildvm_aarch64 @@ -1,9 +1,9 @@ --- # common items for the buildvm-aarch64* koji builders -datacenter: iad2 -dns: 10.3.163.33 +datacenter: rdu3 +dns: 10.16.163.33 docker_registry: "candidate-registry.fedoraproject.org" -eth0_ipv4_gw: 10.3.170.254 +eth0_ipv4_gw: 10.16.170.254 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder diff --git a/inventory/group_vars/buildvm_aarch64_stg b/inventory/group_vars/buildvm_aarch64_stg index 95a7af76fe..0282b33bf0 100644 --- a/inventory/group_vars/buildvm_aarch64_stg +++ b/inventory/group_vars/buildvm_aarch64_stg @@ -1,10 +1,10 @@ --- # common items for the buildvm-* koji builders createrepo: True -datacenter: iad2 -dns: 10.3.163.33 +datacenter: rdu3 +dns: 10.16.163.33 docker_registry: "candidate-registry.stg.fedoraproject.org" -eth0_ipv4_gw: 10.3.167.254 +eth0_ipv4_gw: 10.16.167.254 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder diff --git a/inventory/group_vars/buildvm_osbuild_ppc64le b/inventory/group_vars/buildvm_osbuild_ppc64le index b6c847074e..77613f2954 100644 --- a/inventory/group_vars/buildvm_osbuild_ppc64le +++ b/inventory/group_vars/buildvm_osbuild_ppc64le @@ -1,9 +1,9 @@ # common variables for osbuild workers -datacenter: iad2 -dns: 10.3.163.33 -dns_search1: iad2.fedoraproject.org +datacenter: rdu3 +dns: 10.16.163.33 +dns_search1: rdu3.fedoraproject.org dns_search2: fedoraproject.org -eth0_ipv4_gw: 10.3.171.254 +eth0_ipv4_gw: 10.16.171.254 external: false ks_repo: https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/39/Server/ppc64le/os/ ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora @@ -16,7 +16,7 @@ virt_install_command: "{{ virt_install_command_ppc64le_one_nic_unsafe }}" volgroup: /dev/vg_guests # setup access to workers -ipa_server: ipa01.iad2.fedoraproject.org +ipa_server: ipa01.rdu3.fedoraproject.org ipa_host_group: osbuild ipa_host_group_desc: osbuild Build vms primary_auth_source: ipa diff --git a/inventory/group_vars/buildvm_osbuild_ppc64le_staging b/inventory/group_vars/buildvm_osbuild_ppc64le_staging index 70d3791928..0ca26f1607 100644 --- a/inventory/group_vars/buildvm_osbuild_ppc64le_staging +++ b/inventory/group_vars/buildvm_osbuild_ppc64le_staging @@ -1,9 +1,9 @@ # common variables for osbuild workers (staging) -datacenter: iad2 -dns: 10.3.163.33 -dns_search1: iad2.fedoraproject.org +datacenter: rdu3 +dns: 10.16.163.33 +dns_search1: rdu3.fedoraproject.org dns_search2: fedoraproject.org -eth0_ipv4_gw: 10.3.171.254 +eth0_ipv4_gw: 10.16.171.254 external: false ks_repo: https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/39/Server/ppc64le/os/ ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora @@ -16,7 +16,7 @@ virt_install_command: "{{ virt_install_command_ppc64le_one_nic_unsafe }}" volgroup: /dev/vg_guests # setup access to workers -ipa_server: ipa01.iad2.fedoraproject.org +ipa_server: ipa01.rdu3.fedoraproject.org ipa_host_group: osbuild ipa_host_group_desc: osbuild Build vms primary_auth_source: ipa diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le index f15815b404..15bc415102 100644 --- a/inventory/group_vars/buildvm_ppc64le +++ b/inventory/group_vars/buildvm_ppc64le @@ -1,13 +1,13 @@ # common items for the buildvm-* koji builders # These variables are pushed into /etc/system_identification by the base role. # Groups and individual hosts should ovveride them with specific info. -datacenter: iad2 -dns: 10.3.163.33 -eth0_ipv4_gw: 10.3.171.254 +datacenter: rdu3 +dns: 10.16.163.33 +eth0_ipv4_gw: 10.16.171.254 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder -ipa_server: ipa01.iad2.fedoraproject.org +ipa_server: ipa01.rdu3.fedoraproject.org koji_hub_nfs: "fedora_koji" koji_instance: "primary" koji_server_url: "https://koji.fedoraproject.org/kojihub" diff --git a/inventory/group_vars/buildvm_ppc64le_stg b/inventory/group_vars/buildvm_ppc64le_stg index 59609fbd35..e277349b82 100644 --- a/inventory/group_vars/buildvm_ppc64le_stg +++ b/inventory/group_vars/buildvm_ppc64le_stg @@ -2,9 +2,9 @@ # common items for the buildvm-* koji builders createrepo: True datacenter: staging -dns: 10.3.163.33 +dns: 10.16.163.33 docker_registry: "candidate-registry.stg.fedoraproject.org" -eth0_ipv4_gw: 10.3.167.254 +eth0_ipv4_gw: 10.16.167.254 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder diff --git a/inventory/group_vars/buildvm_s390x_kvm b/inventory/group_vars/buildvm_s390x_kvm index f7e57a9d79..efb778ee2f 100644 --- a/inventory/group_vars/buildvm_s390x_kvm +++ b/inventory/group_vars/buildvm_s390x_kvm @@ -1,7 +1,7 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" +dns1: 10.16.163.33 +dns2: 10.16.163.34 +dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" eth0_ipv4_gw: 10.16.0.254 ks_repo: https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/41/Server/s390x/os/ diff --git a/inventory/group_vars/buildvm_stg b/inventory/group_vars/buildvm_stg index ac766b92bc..abfbf7b783 100644 --- a/inventory/group_vars/buildvm_stg +++ b/inventory/group_vars/buildvm_stg @@ -1,13 +1,13 @@ --- # common items for the buildvm-* koji builders -datacenter: iad2 -dns1: 10.3.163.33 +datacenter: rdu3 +dns1: 10.16.163.33 docker_registry: "candidate-registry.stg.fedoraproject.org" -eth0_ipv4_gw: 10.3.167.254 +eth0_ipv4_gw: 10.16.167.254 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder -ipa_server: ipa01.stg.iad2.fedoraproject.org +ipa_server: ipa01.stg.rdu3.fedoraproject.org koji_hub: "koji.stg.fedoraproject.org/kojihub" koji_hub_nfs: "fedora_koji" koji_instance: "primary" @@ -25,7 +25,7 @@ max_mem_size: "{{ mem_size }}" mem_size: 10240 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" num_cpus: 4 -resolvconf: "resolv.conf/iad2" +resolvconf: "resolv.conf/rdu3" source_registry: "registry.fedoraproject.org" virt_install_command: "{{ virt_install_command_one_nic_unsafe }}" volgroup: /dev/vg_guests diff --git a/inventory/group_vars/buildvm_x86_riscv b/inventory/group_vars/buildvm_x86_riscv index 2620340822..38d56288b6 100644 --- a/inventory/group_vars/buildvm_x86_riscv +++ b/inventory/group_vars/buildvm_x86_riscv @@ -1,7 +1,7 @@ --- # common items for the buildvm-* koji builders -dns: 10.3.163.33 -eth0_ipv4_gw: 10.3.172.254 +dns: 10.16.163.33 +eth0_ipv4_gw: 10.16.172.254 external: false # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/certgetter b/inventory/group_vars/certgetter index e07c67809f..d4988816fb 100644 --- a/inventory/group_vars/certgetter +++ b/inventory/group_vars/certgetter @@ -1,9 +1,9 @@ --- # Define resources for this group of hosts here. # Neeed for rsync from log01 for logs. -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] +custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' lvm_size: 20000 mem_size: 2048 diff --git a/inventory/group_vars/certgetter_stg b/inventory/group_vars/certgetter_stg index e573af21a8..177cf1b29b 100644 --- a/inventory/group_vars/certgetter_stg +++ b/inventory/group_vars/certgetter_stg @@ -1,9 +1,9 @@ --- # Define resources for this group of hosts here. # Neeed for rsync from log01 for logs. -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] +custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' lvm_size: 20000 mem_size: 2048 diff --git a/inventory/group_vars/checkcompose b/inventory/group_vars/checkcompose index 58b887763a..eadf35c3ee 100644 --- a/inventory/group_vars/checkcompose +++ b/inventory/group_vars/checkcompose @@ -6,7 +6,7 @@ checkcompose_prod: true # if additional systems were added to this group. checkcompose_emailfrom: rawhide@fedoraproject.org checkcompose_emailto: "test-reports@lists.fedoraproject.org" -checkcompose_smtp: bastion.iad2.fedoraproject.org +checkcompose_smtp: bastion.rdu3.fedoraproject.org checkcompose_subvariant_emails: BaseOS: error: ["yselkowitz@redhat.com", "aavraham@redhat.com"] diff --git a/inventory/group_vars/download_iad2 b/inventory/group_vars/download_iad2 deleted file mode 100644 index bb5683e4db..0000000000 --- a/inventory/group_vars/download_iad2 +++ /dev/null @@ -1,15 +0,0 @@ ---- -blocked_ips: [] -datacenter: iad2 -dns: 10.3.163.33 -# -# This host is externally reachable -# -external: true -host_group: download-iad2 -# nfs mount options, overrides the all/default -nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=4" -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" -tcp_ports: [80, 443, 873] diff --git a/inventory/group_vars/iad2_production b/inventory/group_vars/iad2_production deleted file mode 100644 index 0e6ec0ad4b..0000000000 --- a/inventory/group_vars/iad2_production +++ /dev/null @@ -1,28 +0,0 @@ ---- -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - type: ethernet - mtu: 9000 -nbde: true -nbde_device: /dev/md2 -nbde_client_bindings: - - device: "{{ nbde_device }}" - encryption_password: "{{ nbde_password }}" - password_temporary: no - threshold: 1 - servers: - - http://tang01.iad2.fedoraproject.org - - http://tang02.iad2.fedoraproject.org diff --git a/inventory/group_vars/iad2_staging b/inventory/group_vars/iad2_staging deleted file mode 100644 index 7a168d7a2e..0000000000 --- a/inventory/group_vars/iad2_staging +++ /dev/null @@ -1,11 +0,0 @@ ---- -nbde: true -nbde_device: /dev/md2 -nbde_client_bindings: - - device: "{{ nbde_device }}" - encryption_password: "{{ nbde_password }}" - password_temporary: no - threshold: 1 - servers: - - http://tang01.iad2.fedoraproject.org - - http://tang02.iad2.fedoraproject.org diff --git a/inventory/group_vars/ipa b/inventory/group_vars/ipa index b69dca6de9..4925895520 100644 --- a/inventory/group_vars/ipa +++ b/inventory/group_vars/ipa @@ -1,7 +1,7 @@ --- # Define resources for this group of hosts here. -custom_rules: ['-A INPUT -p udp -m udp -s 10.3.0.0/16 --dport 53 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.3.0.0/16 udp dport 53 counter accept'] +custom_rules: ['-A INPUT -p udp -m udp -s 10.16.0.0/16 --dport 53 -j ACCEPT'] +nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.16.0.0/16 udp dport 53 counter accept'] host_backup_targets: ['/var/lib/ipa/backup', '/var/log/dirsrv/slapd-FEDORAPROJECT-ORG'] ipa_client_shell_groups: - sysadmin-accounts diff --git a/inventory/group_vars/ipsilon b/inventory/group_vars/ipsilon index fd2093627b..74e9f97595 100644 --- a/inventory/group_vars/ipsilon +++ b/inventory/group_vars/ipsilon @@ -1,13 +1,13 @@ --- # Define resources for this group of hosts here. # Neeed for rsync from log01 for logs. -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] +custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' ipa_host_group: ipsilon ipa_host_group_desc: Ipsilon SSO application -ipsilon_db_host: "db-fas01.iad2.fedoraproject.org" +ipsilon_db_host: "db-fas01.rdu3.fedoraproject.org" lvm_size: 50000 mem_size: 32768 num_cpus: 2 diff --git a/inventory/group_vars/ipsilon_stg b/inventory/group_vars/ipsilon_stg index 25ee6fd454..e911a21f10 100644 --- a/inventory/group_vars/ipsilon_stg +++ b/inventory/group_vars/ipsilon_stg @@ -1,9 +1,9 @@ --- # Define resources for this group of hosts here. # Neeed for rsync from log01 for logs. -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] +custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' ipa_host_group: ipsilon ipa_host_group_desc: Ipsilon SSO application @@ -11,7 +11,7 @@ ipa_client_shell_groups: - sysadmin-noc ipa_client_sudo_groups: - sysadmin-noc -ipsilon_db_host: "db-fas01.stg.iad2.fedoraproject.org" +ipsilon_db_host: "db-fas01.stg.rdu3.fedoraproject.org" lvm_size: 20000 mem_size: 4096 num_cpus: 2 diff --git a/inventory/group_vars/kernel_qa b/inventory/group_vars/kernel_qa index 0343a50700..cca11da72a 100644 --- a/inventory/group_vars/kernel_qa +++ b/inventory/group_vars/kernel_qa @@ -8,4 +8,4 @@ ipa_client_sudo_groups: - sysadmin-kernel ipa_host_group: kernel_qa ipa_host_group_desc: kernel test machines -resolvconf: "{{ files }}/resolv.conf/iad2" +resolvconf: "{{ files }}/resolv.conf/rdu3" diff --git a/inventory/group_vars/kojipkgs b/inventory/group_vars/kojipkgs index 0b1c93f477..b8e6a711bb 100644 --- a/inventory/group_vars/kojipkgs +++ b/inventory/group_vars/kojipkgs @@ -3,10 +3,10 @@ # For the MOTD custom_rules: [ # Need for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT'] # Need for rsync from log01 for logs. nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' ipa_client_shell_groups: - sysadmin-noc diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index f68a6d0117..ea9b38da47 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -10,16 +10,16 @@ dns_external: # to add that group to this list. Other items on this list are ones # where it is an enormous group not needed. # Exclude these ansible host groups in hostgroups/all.cfg -exclude_iad2_hostgroups: +exclude_rdu3_hostgroups: - centos_ipa_client_stg - zabbix_stg - zabbix - logdetective -#iad2_management_slowping: +#rdu3_management_slowping: # - ppc8-01-fsp.mgmt.fedoraproject.org # - ppc8-02-fsp.mgmt.fedoraproject.org # - ppc8-03-fsp.mgmt.fedoraproject.org -iad2_external: +rdu3_external: - bastion01.fedoraproject.org - bastion02.fedoraproject.org - dl-iad01.fedoraproject.org @@ -37,95 +37,10 @@ iad2_external: - proxy10.fedoraproject.org - secondary01.fedoraproject.org # -# This is a list of hosts which are in the IAD2 160 mgmt network +# This is a list of hosts which are in the RDU3 160 mgmt network # we do not have them in ansible because it tries to connect # and they don't do ansible # -iad2_management_hosts: - - autosign02.mgmt.iad2.fedoraproject.org - - backup01.mgmt.iad2.fedoraproject.org - - bkernel01.mgmt.iad2.fedoraproject.org - - bkernel02.mgmt.iad2.fedoraproject.org - - bvmhost-a64-01.mgmt.iad2.fedoraproject.org. - - bvmhost-a64-02.mgmt.iad2.fedoraproject.org. - - bvmhost-a64-03.mgmt.iad2.fedoraproject.org. - - bvmhost-a64-04.mgmt.iad2.fedoraproject.org. - - bvmhost-p09-01.mgmt.iad2.fedoraproject.org. - - bvmhost-p09-02.mgmt.iad2.fedoraproject.org. - - bvmhost-p09-03.mgmt.iad2.fedoraproject.org. - - bvmhost-p09-04.mgmt.iad2.fedoraproject.org. - - bvmhost-x86-01.mgmt.iad2.fedoraproject.org - - bvmhost-x86-02.mgmt.iad2.fedoraproject.org - - bvmhost-x86-03.mgmt.iad2.fedoraproject.org - - bvmhost-x86-04.mgmt.iad2.fedoraproject.org - - bvmhost-x86-05.mgmt.iad2.fedoraproject.org - - bvmhost-x86-06.mgmt.iad2.fedoraproject.org - - bvmhost-x86-07.mgmt.iad2.fedoraproject.org - - dell-fx01-fc01.mgmt.iad2.fedoraproject.org - - dell-fx01-fc02.mgmt.iad2.fedoraproject.org - - dell-fx01-fc03.mgmt.iad2.fedoraproject.org - - dell-fx01-fc04.mgmt.iad2.fedoraproject.org - - dell-fx01-fc05.mgmt.iad2.fedoraproject.org - - dell-fx01-fc06.mgmt.iad2.fedoraproject.org - - dell-fx01-fc07.mgmt.iad2.fedoraproject.org - - dell-fx01-fc08.mgmt.iad2.fedoraproject.org - - dell-fx01.mgmt.iad2.fedoraproject.org - - dell-fx02-fc01.mgmt.iad2.fedoraproject.org - - dell-fx02-fc02.mgmt.iad2.fedoraproject.org - - dell-fx02-fc03.mgmt.iad2.fedoraproject.org - - dell-fx02-fc04.mgmt.iad2.fedoraproject.org - - dell-fx02-fc05.mgmt.iad2.fedoraproject.org - - dell-fx02-fc06.mgmt.iad2.fedoraproject.org - - dell-fx02-fc07.mgmt.iad2.fedoraproject.org - - dell-fx02-fc08.mgmt.iad2.fedoraproject.org - - dell-fx02.mgmt.iad2.fedoraproject.org - - openqa-a64-worker01.mgmt.iad2.fedoraproject.org - - openqa-a64-worker02.mgmt.iad2.fedoraproject.org - - openqa-a64-worker03.mgmt.iad2.fedoraproject.org - - openqa-p09-worker01.mgmt.iad2.fedoraproject.org - - openqa-p09-worker02.mgmt.iad2.fedoraproject.org - - openqa-x86-worker01.mgmt.iad2.fedoraproject.org - - openqa-x86-worker02.mgmt.iad2.fedoraproject.org - - openqa-x86-worker03.mgmt.iad2.fedoraproject.org - - openqa-x86-worker04.mgmt.iad2.fedoraproject.org - - openqa-x86-worker05.mgmt.iad2.fedoraproject.org - - openqa-x86-worker06.mgmt.iad2.fedoraproject.org - - qvmhost-x86-01.mgmt.iad2.fedoraproject.org - - qvmhost-x86-02.mgmt.iad2.fedoraproject.org - - sign-vault01.mgmt.iad2.fedoraproject.org - - sign-vault02.mgmt.iad2.fedoraproject.org - - vmhost-x86-01.mgmt.iad2.fedoraproject.org - - vmhost-x86-02.mgmt.iad2.fedoraproject.org - - vmhost-x86-03.mgmt.iad2.fedoraproject.org - - vmhost-x86-04.mgmt.iad2.fedoraproject.org - - vmhost-x86-05.mgmt.iad2.fedoraproject.org - - vmhost-x86-06.mgmt.iad2.fedoraproject.org - - vmhost-x86-08.mgmt.iad2.fedoraproject.org - - bvmhost-a64-01-stg.mgmt.iad2.fedoraproject.org - - bvmhost-x86-01-stg.mgmt.iad2.fedoraproject.org - - bvmhost-x86-02-stg.mgmt.iad2.fedoraproject.org - - bvmhost-x86-03-stg.mgmt.iad2.fedoraproject.org - - bvmhost-x86-05-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-01-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-02-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-05-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-06-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-07-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-08-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-09-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-11-stg.mgmt.iad2.fedoraproject.org - - vmhost-x86-12-stg.mgmt.iad2.fedoraproject.org - - worker01.mgmt.iad2.fedoraproject.org - - worker02.mgmt.iad2.fedoraproject.org - - worker03.mgmt.iad2.fedoraproject.org - - worker04.mgmt.iad2.fedoraproject.org - - worker05.mgmt.iad2.fedoraproject.org - - worker06.mgmt.iad2.fedoraproject.org - - worker01-stg.mgmt.iad2.fedoraproject.org - - worker02-stg.mgmt.iad2.fedoraproject.org - - worker03-stg.mgmt.iad2.fedoraproject.org - - worker04-stg.mgmt.iad2.fedoraproject.org - - worker05-stg.mgmt.iad2.fedoraproject.org rdu3_management_hosts: - autosign01.mgmt.rdu3.fedoraproject.org - backup01.mgmt.rdu3.fedoraproject.org @@ -175,8 +90,8 @@ rdu3_management_hosts: # These are management interfaces we only want # to test ping against. No http/https # -iad2_management_limited: - - opengear01.mgmt.iad2.fedoraproject.org +rdu3_management_limited: + - opengear01.mgmt.rdu3.fedoraproject.org ipa_client_shell_groups: - sysadmin-noc - sysadmin-veteran diff --git a/inventory/group_vars/openqa_lab_workers b/inventory/group_vars/openqa_lab_workers index f9c1c80f9a..96b5fcf053 100644 --- a/inventory/group_vars/openqa_lab_workers +++ b/inventory/group_vars/openqa_lab_workers @@ -1,6 +1,6 @@ deployment_type: stg freezes: false -gw: 10.3.174.254 +gw: 10.16.174.254 ipa_client_shell_groups: - sysadmin-qa ipa_client_sudo_groups: diff --git a/inventory/group_vars/openqa_onebox_test b/inventory/group_vars/openqa_onebox_test index 483d3611b0..537b68127b 100644 --- a/inventory/group_vars/openqa_onebox_test +++ b/inventory/group_vars/openqa_onebox_test @@ -17,7 +17,7 @@ deployment_type: stg # the webui from outside the box, but we gotta set it to something external_hostname: openqa.oneboxtest.fedoraproject.org freezes: false -gw: 10.3.174.254 +gw: 10.16.174.254 # we need this bigger on stg to handle Rawhide updates, if we enable # Rawhide update testing in prod we can just move this to servers_common diff --git a/inventory/group_vars/proxies b/inventory/group_vars/proxies index 8c307fb2f9..bd8e071c35 100644 --- a/inventory/group_vars/proxies +++ b/inventory/group_vars/proxies @@ -6,22 +6,22 @@ collectd_apache: true # For the MOTD custom_rules: [ # Need for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.181.102 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.181.102 --dport 873 -j ACCEPT', # allow varnish from localhost '-A INPUT -p tcp -m tcp -s 127.0.0.1 --dport 6081 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 127.0.0.1 --dport 6082 -j ACCEPT', # also allow varnish from internal for purge requests - '-A INPUT -p tcp -m tcp -s 192.168.1.0/24 --dport 6081 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.0/24 --dport 6081 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.120 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.121 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.122 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.123 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.124 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.125 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.126 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.65 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.127 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.128 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.163.129 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 192.168.1.0/24 --dport 6081 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.0/24 --dport 6081 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.120 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.121 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.122 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.123 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.124 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.125 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.126 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.65 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.127 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.128 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.129 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.120 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.121 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.163.122 -j ACCEPT', @@ -65,7 +65,7 @@ nft_block_rules: - 'add rule ip filter INPUT ip saddr 66.249.69.0/24 counter reject' nft_custom_rules: # Need for rsync from log01 for logs. - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 209.132.181.102 tcp dport 873 counter accept' # allow varnish from localhost @@ -73,18 +73,18 @@ nft_custom_rules: - 'add rule ip filter INPUT ip saddr 127.0.0.1 tcp dport 6082 counter accept' # also allow varnish from internal for purge requests - 'add rule ip filter INPUT ip saddr 192.168.1.0/24 tcp dport 6081 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.0/24 tcp dport 6081 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.120 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.121 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.122 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.123 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.124 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.125 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.126 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.65 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.127 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.128 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.129 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.0/24 tcp dport 6081 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.120 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.121 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.122 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.123 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.124 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.125 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.126 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.65 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.127 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.128 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.129 tcp dport 22623 counter accept' - 'add rule ip filter INPUT ip saddr 10.16.163.120 tcp dport 22623 counter accept' - 'add rule ip filter INPUT ip saddr 10.16.163.121 tcp dport 22623 counter accept' - 'add rule ip filter INPUT ip saddr 10.16.163.122 tcp dport 22623 counter accept' @@ -116,10 +116,10 @@ nagios_Check_Services: swap: false num_cpus: 6 ocp_masters: - #- bootstrap.ocp.iad2.fedoraproject.org - - ocp01.ocp.iad2.fedoraproject.org - - ocp02.ocp.iad2.fedoraproject.org - - ocp03.ocp.iad2.fedoraproject.org + #- bootstrap.ocp.rdu3.fedoraproject.org + - ocp01.ocp.rdu3.fedoraproject.org + - ocp02.ocp.rdu3.fedoraproject.org + - ocp03.ocp.rdu3.fedoraproject.org # we override this here to point to the vpn endpoints of the ocp_nodes instead of # The real internal hostnames. This is because proxies access them via vpn. ocp_nodes: diff --git a/inventory/group_vars/proxies_stg b/inventory/group_vars/proxies_stg index 08da4add4f..ce452254dc 100644 --- a/inventory/group_vars/proxies_stg +++ b/inventory/group_vars/proxies_stg @@ -4,31 +4,31 @@ collectd_apache: true # For the MOTD custom_rules: [ # Need for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', # allow varnish from localhost '-A INPUT -p tcp -m tcp -s 127.0.0.1 --dport 6081 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 127.0.0.1 --dport 6082 -j ACCEPT', # also allow varnish from internal for purge requests - '-A INPUT -p tcp -m tcp -s 192.168.1.0/24 --dport 6081 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.0/24 --dport 6081 -j ACCEPT', - '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.115 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.116 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.117 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.118 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.119 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.120 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.121 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.122 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.3.166.123 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 192.168.1.0/24 --dport 6081 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.0/24 --dport 6081 -j ACCEPT', + '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.115 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.116 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.117 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.118 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.119 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.120 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.121 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.122 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 22623 -s 10.16.166.123 -j ACCEPT'] nft_custom_rules: # Need for rsync from log01 for logs. - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' # allow varnish from localhost - 'add rule ip filter INPUT ip saddr 127.0.0.1 tcp dport 6081 counter accept' - 'add rule ip filter INPUT ip saddr 127.0.0.1 tcp dport 6082 counter accept' # also allow varnish from internal for purge requests - 'add rule ip filter INPUT ip saddr 192.168.1.0/24 tcp dport 6081 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.0/24 tcp dport 6081 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.115 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.116 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.117 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.118 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.119 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.120 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.121 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.122 tcp dport 22623 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.123 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.0/24 tcp dport 6081 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.115 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.116 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.117 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.118 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.119 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.120 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.121 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.122 tcp dport 22623 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.123 tcp dport 22623 counter accept' # Need for rsync from log01 for logs. - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.50 tcp dport 873 counter accept' @@ -66,10 +66,10 @@ maxrequestworkers: 900 mem_size: 8192 num_cpus: 2 ocp_masters_stg: - # - bootstrap.ocp.stg.iad2.fedoraproject.org - - ocp01.ocp.stg.iad2.fedoraproject.org - - ocp02.ocp.stg.iad2.fedoraproject.org - - ocp03.ocp.stg.iad2.fedoraproject.org + # - bootstrap.ocp.stg.rdu3.fedoraproject.org + - ocp01.ocp.stg.rdu3.fedoraproject.org + - ocp02.ocp.stg.rdu3.fedoraproject.org + - ocp03.ocp.stg.rdu3.fedoraproject.org ocp_nodes_stg: - worker01.ocp.stg.rdu3.fedoraproject.org - worker02.ocp.stg.rdu3.fedoraproject.org @@ -97,7 +97,7 @@ tcp_ports: [ 8443, ] varnish_group: proxies -zabbix_templates: "{{ [] }}" # For the moment we have no proxies external to IAD2, if this changes, put in the changes in the production group. +zabbix_templates: "{{ [] }}" # For the moment we have no proxies external to RDU3, if this changes, put in the changes in the production group. notes: | * Provides frontend (reverse) proxy for most web applications diff --git a/inventory/group_vars/rabbitmq b/inventory/group_vars/rabbitmq index a6661b7aab..51ac4dfd46 100644 --- a/inventory/group_vars/rabbitmq +++ b/inventory/group_vars/rabbitmq @@ -1,20 +1,20 @@ --- custom_rules: [ # Neeed for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', # Inter-node traffic - '-A INPUT -p tcp -m tcp -s 10.3.163.78 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.79 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.80 --dport 25672 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.78 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.79 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.80 --dport 25672 -j ACCEPT', # Same but in RDU3 '-A INPUT -p tcp -m tcp -s 10.16.163.78 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.79 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.80 --dport 25672 -j ACCEPT', ] nft_custom_rules: # Neeed for rsync from log01 for logs. - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' # Inter-node traffic - - 'add rule ip filter INPUT ip saddr 10.3.163.78 tcp dport 25672 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.79 tcp dport 25672 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.80 tcp dport 25672 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.78 tcp dport 25672 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.79 tcp dport 25672 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.80 tcp dport 25672 counter accept' # In RDU3 - 'add rule ip filter INPUT ip saddr 10.16.163.78 tcp dport 25672 counter accept' - 'add rule ip filter INPUT ip saddr 10.16.163.79 tcp dport 25672 counter accept' diff --git a/inventory/group_vars/rabbitmq_stg b/inventory/group_vars/rabbitmq_stg index 60c29a6f5f..c49e840c32 100644 --- a/inventory/group_vars/rabbitmq_stg +++ b/inventory/group_vars/rabbitmq_stg @@ -1,20 +1,20 @@ --- custom_rules: [ # Neeed for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', # Inter-node traffic - '-A INPUT -p tcp -m tcp -s 10.3.166.78 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.166.79 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.166.80 --dport 25672 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.166.78 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.166.79 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.166.80 --dport 25672 -j ACCEPT', # Same but in RDU3 '-A INPUT -p tcp -m tcp -s 10.16.166.78 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.166.79 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.166.80 --dport 25672 -j ACCEPT', ] nft_custom_rules: # Neeed for rsync from log01 for logs. - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' # Inter-node traffic - - 'add rule ip filter INPUT ip saddr 10.3.166.78 tcp dport 25672 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.79 tcp dport 25672 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.166.80 tcp dport 25672 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.78 tcp dport 25672 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.79 tcp dport 25672 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.166.80 tcp dport 25672 counter accept' # In RDU3 - 'add rule ip filter INPUT ip saddr 10.16.166.78 tcp dport 25672 counter accept' - 'add rule ip filter INPUT ip saddr 10.16.166.79 tcp dport 25672 counter accept' diff --git a/inventory/group_vars/rdu3_staging b/inventory/group_vars/rdu3_staging index 0df93f50f7..c180c3782e 100644 --- a/inventory/group_vars/rdu3_staging +++ b/inventory/group_vars/rdu3_staging @@ -4,7 +4,6 @@ dns: 10.16.163.33 dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" -dns_search2: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" nbde: true nbde_device: /dev/md2 diff --git a/inventory/group_vars/releng_compose b/inventory/group_vars/releng_compose index 7294c75be0..dcbe6371d1 100644 --- a/inventory/group_vars/releng_compose +++ b/inventory/group_vars/releng_compose @@ -1,6 +1,6 @@ --- # common items for the releng-* boxes -dns: 10.3.163.33 +dns: 10.16.163.33 freezes: true host_group: releng ipa_client_shell_groups: diff --git a/inventory/group_vars/releng_compose_eln b/inventory/group_vars/releng_compose_eln index 622a3a88b4..a26b8aa345 100644 --- a/inventory/group_vars/releng_compose_eln +++ b/inventory/group_vars/releng_compose_eln @@ -1,6 +1,6 @@ --- # common items for the releng-* boxes -dns: 10.3.163.33 +dns: 10.16.163.33 external: false host_group: releng_eln ipa_client_shell_groups: diff --git a/inventory/group_vars/releng_compose_riscv b/inventory/group_vars/releng_compose_riscv index 9c07c1fc03..d4056ce137 100644 --- a/inventory/group_vars/releng_compose_riscv +++ b/inventory/group_vars/releng_compose_riscv @@ -1,6 +1,6 @@ --- # common items for the releng-* boxes -dns: 10.3.163.33 +dns: 10.16.163.33 external: false host_group: releng_riscv ipa_client_shell_groups: diff --git a/inventory/group_vars/secondary b/inventory/group_vars/secondary index ec8bd98cda..3efe20b5da 100644 --- a/inventory/group_vars/secondary +++ b/inventory/group_vars/secondary @@ -1,5 +1,5 @@ --- -datacenter: iad2 +datacenter: rdu3 host_group: secondary ipa_client_shell_groups: - alt-k12linux diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging index ad404ee9d3..004632f8d2 100644 --- a/inventory/group_vars/staging +++ b/inventory/group_vars/staging @@ -2,7 +2,6 @@ datanommer_db_hostname: db-datanommer01 deployment_type: stg dns_search1: "stg.rdu3.fedoraproject.org" -dns_search2: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" env: staging env_prefix: stg. diff --git a/inventory/group_vars/value b/inventory/group_vars/value index 9210d77a6d..6321063d96 100644 --- a/inventory/group_vars/value +++ b/inventory/group_vars/value @@ -3,20 +3,20 @@ # For the MOTD custom_rules: [ # Needed for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', # Needed to let nagios on noc01 and noc02 pipe alerts to zodbot here - '-A INPUT -p tcp -m tcp -s 10.3.163.10 --dport 5050 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.20 --dport 5050 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.10 --dport 5050 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.20 --dport 5050 -j ACCEPT', # batcave01 also needs access to announce commits. - '-A INPUT -p tcp -m tcp -s 10.3.163.35 --dport 5050 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 10.16.163.35 --dport 5050 -j ACCEPT'] nft_custom_rules: # Needed for rsync from log01 for logs. - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' # Needed to let nagios on noc01 and noc02 pipe alerts to zodbot here - - 'add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5050 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5050 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.20 tcp dport 5050 counter accept' # batcave01 also needs access to announce commits. - - 'add rule ip filter INPUT ip saddr 10.3.163.35 tcp dport 5050 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.35 tcp dport 5050 counter accept' deployment_type: prod ipa_client_shell_groups: - fi-apprentice diff --git a/inventory/group_vars/value_stg b/inventory/group_vars/value_stg index 166b76c433..02e65cdfdf 100644 --- a/inventory/group_vars/value_stg +++ b/inventory/group_vars/value_stg @@ -3,21 +3,21 @@ # For the MOTD custom_rules: [ # Neeed for rsync from log01 for logs. - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', # Needed to let nagios on noc01 and noc02 (noc01.stg) pipe alerts to zodbot here - '-A INPUT -p tcp -m tcp -s 10.3.163.10 --dport 5050 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.10 --dport 5050 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 152.19.134.192 --dport 5050 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.16.163.10 --dport 5050 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.16.163.10 --dport 5050 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 152.19.134.192 --dport 5050 -j ACCEPT', # batcave01 also needs access to announce commits. - '-A INPUT -p tcp -m tcp -s 10.3.163.35 --dport 5050 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 10.16.163.35 --dport 5050 -j ACCEPT'] nft_custom_rules: # Neeed for rsync from log01 for logs. - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.39 tcp dport 873 counter accept' - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' # Needed to let nagios on noc01 and noc02 (noc01.stg) pipe alerts to zodbot here - - 'add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5050 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5050 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5050 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5050 counter accept' - 'add rule ip filter INPUT ip saddr 152.19.134.192 tcp dport 5050 counter accept' # batcave01 also needs access to announce commits. - - 'add rule ip filter INPUT ip saddr 10.3.163.35 tcp dport 5050 counter accept' + - 'add rule ip filter INPUT ip saddr 10.16.163.35 tcp dport 5050 counter accept' deployment_type: stg ipa_client_shell_groups: - fi-apprentice diff --git a/inventory/hardware b/inventory/hardware index 58a4bbb1f0..4dba9dc13b 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -3,7 +3,7 @@ osuosl02.fedoraproject.org ibiblio02.fedoraproject.org ibiblio05.fedoraproject.org # ssh often disabled -#autosign02.iad2.fedoraproject.org +#autosign02.rdu3.fedoraproject.org vmhost-x86-cc01.rdu-cc.fedoraproject.org vmhost-x86-cc02.rdu-cc.fedoraproject.org vmhost-x86-cc03.rdu-cc.fedoraproject.org @@ -13,34 +13,7 @@ vmhost-x86-copr01.rdu-cc.fedoraproject.org vmhost-x86-copr02.rdu-cc.fedoraproject.org vmhost-x86-copr03.rdu-cc.fedoraproject.org vmhost-x86-copr04.rdu-cc.fedoraproject.org -## Builders IAD -buildhw-x86-01.iad2.fedoraproject.org -buildhw-x86-02.iad2.fedoraproject.org -buildhw-x86-03.iad2.fedoraproject.org -buildhw-x86-04.iad2.fedoraproject.org -buildhw-x86-05.iad2.fedoraproject.org -buildhw-x86-06.iad2.fedoraproject.org -buildhw-x86-07.iad2.fedoraproject.org -buildhw-x86-08.iad2.fedoraproject.org -buildhw-x86-09.iad2.fedoraproject.org -buildhw-x86-10.iad2.fedoraproject.org -buildhw-x86-11.iad2.fedoraproject.org -buildhw-x86-12.iad2.fedoraproject.org -buildhw-x86-13.iad2.fedoraproject.org -buildhw-x86-14.iad2.fedoraproject.org -buildhw-x86-15.iad2.fedoraproject.org -buildhw-x86-16.iad2.fedoraproject.org -bvmhost-x86-01.iad2.fedoraproject.org -bvmhost-x86-02.iad2.fedoraproject.org -bvmhost-x86-03.iad2.fedoraproject.org -bvmhost-x86-04.iad2.fedoraproject.org -bvmhost-x86-05.iad2.fedoraproject.org -bvmhost-x86-06.iad2.fedoraproject.org -bvmhost-x86-07.iad2.fedoraproject.org -bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org -bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-05.stg.iad2.fedoraproject.org +## Builders RDU3 bvmhost-x86-01.rdu3.fedoraproject.org bvmhost-x86-02.rdu3.fedoraproject.org bvmhost-x86-03.rdu3.fedoraproject.org @@ -50,48 +23,44 @@ bvmhost-x86-06.rdu3.fedoraproject.org bvmhost-x86-01.stg.rdu3.fedoraproject.org bvmhost-x86-02.stg.rdu3.fedoraproject.org bvmhost-x86-03.stg.rdu3.fedoraproject.org -## -bkernel01.iad2.fedoraproject.org -bkernel02.iad2.fedoraproject.org ## QA -qvmhost-x86-01.iad2.fedoraproject.org -qvmhost-x86-02.iad2.fedoraproject.org -openqa-x86-worker01.iad2.fedoraproject.org -openqa-x86-worker02.iad2.fedoraproject.org -openqa-x86-worker03.iad2.fedoraproject.org -openqa-x86-worker04.iad2.fedoraproject.org -openqa-x86-worker05.iad2.fedoraproject.org -openqa-x86-worker06.iad2.fedoraproject.org -kernel02.iad2.fedoraproject.org +qvmhost-x86-01.rdu3.fedoraproject.org +openqa-x86-worker01.rdu3.fedoraproject.org +openqa-x86-worker02.rdu3.fedoraproject.org +openqa-x86-worker03.rdu3.fedoraproject.org +openqa-x86-worker04.rdu3.fedoraproject.org +openqa-x86-worker05.rdu3.fedoraproject.org +openqa-x86-worker06.rdu3.fedoraproject.org +kernel02.rdu3.fedoraproject.org qvmhost-x86-01.rdu3.fedoraproject.org ## Virt -vmhost-x86-01.iad2.fedoraproject.org -vmhost-x86-01.stg.iad2.fedoraproject.org -vmhost-x86-02.iad2.fedoraproject.org -vmhost-x86-02.stg.iad2.fedoraproject.org -vmhost-x86-03.iad2.fedoraproject.org -vmhost-x86-04.iad2.fedoraproject.org -vmhost-x86-05.iad2.fedoraproject.org -vmhost-x86-05.stg.iad2.fedoraproject.org -vmhost-x86-06.iad2.fedoraproject.org -vmhost-x86-06.stg.iad2.fedoraproject.org -vmhost-x86-07.stg.iad2.fedoraproject.org -vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-08.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-11.stg.iad2.fedoraproject.org -vmhost-x86-12.stg.iad2.fedoraproject.org -worker01.ocp.iad2.fedoraproject.org -worker02.ocp.iad2.fedoraproject.org -worker03.ocp.iad2.fedoraproject.org -worker04.ocp.iad2.fedoraproject.org -worker05.ocp.iad2.fedoraproject.org -worker06.ocp.iad2.fedoraproject.org -worker01.ocp.stg.iad2.fedoraproject.org -worker02.ocp.stg.iad2.fedoraproject.org -worker03.ocp.stg.iad2.fedoraproject.org -worker04.ocp.stg.iad2.fedoraproject.org -worker05.ocp.stg.iad2.fedoraproject.org +vmhost-x86-01.rdu3.fedoraproject.org +vmhost-x86-01.stg.rdu3.fedoraproject.org +vmhost-x86-02.rdu3.fedoraproject.org +vmhost-x86-02.stg.rdu3.fedoraproject.org +vmhost-x86-03.rdu3.fedoraproject.org +vmhost-x86-04.rdu3.fedoraproject.org +vmhost-x86-05.rdu3.fedoraproject.org +vmhost-x86-05.stg.rdu3.fedoraproject.org +vmhost-x86-06.rdu3.fedoraproject.org +vmhost-x86-06.stg.rdu3.fedoraproject.org +vmhost-x86-07.stg.rdu3.fedoraproject.org +vmhost-x86-08.stg.rdu3.fedoraproject.org +vmhost-x86-08.rdu3.fedoraproject.org +vmhost-x86-09.stg.rdu3.fedoraproject.org +vmhost-x86-11.stg.rdu3.fedoraproject.org +vmhost-x86-12.stg.rdu3.fedoraproject.org +worker01.ocp.rdu3.fedoraproject.org +worker02.ocp.rdu3.fedoraproject.org +worker03.ocp.rdu3.fedoraproject.org +worker04.ocp.rdu3.fedoraproject.org +worker05.ocp.rdu3.fedoraproject.org +worker06.ocp.rdu3.fedoraproject.org +worker01.ocp.stg.rdu3.fedoraproject.org +worker02.ocp.stg.rdu3.fedoraproject.org +worker03.ocp.stg.rdu3.fedoraproject.org +worker04.ocp.stg.rdu3.fedoraproject.org +worker05.ocp.stg.rdu3.fedoraproject.org vmhost-x86-01.rdu3.fedoraproject.org vmhost-x86-02.rdu3.fedoraproject.org vmhost-x86-03.rdu3.fedoraproject.org @@ -106,51 +75,42 @@ sign-vault01.rdu3.fedoraproject.org backup01.rdu3.fedoraproject.org [powerpc] -bvmhost-p09-01.iad2.fedoraproject.org -bvmhost-p09-01.stg.iad2.fedoraproject.org -bvmhost-p09-02.iad2.fedoraproject.org -bvmhost-p09-03.iad2.fedoraproject.org -bvmhost-p09-04.iad2.fedoraproject.org -bvmhost-p09-05.iad2.fedoraproject.org -openqa-p09-worker01.iad2.fedoraproject.org -openqa-p09-worker02.iad2.fedoraproject.org +bvmhost-p09-01.rdu3.fedoraproject.org +bvmhost-p09-01.stg.rdu3.fedoraproject.org +bvmhost-p09-02.rdu3.fedoraproject.org +bvmhost-p09-03.rdu3.fedoraproject.org +bvmhost-p09-04.rdu3.fedoraproject.org +bvmhost-p09-05.rdu3.fedoraproject.org vmhost-p08-copr01.rdu-cc.fedoraproject.org vmhost-p08-copr02.rdu-cc.fedoraproject.org vmhost-p09-copr01.rdu-cc.fedoraproject.org bvmhost-p10-01.rdu3.fedoraproject.org [appliedmicro] -bvmhost-a64-01.stg.iad2.fedoraproject.org -openqa-a64-worker01.iad2.fedoraproject.org -openqa-a64-worker02.iad2.fedoraproject.org -openqa-a64-worker03.iad2.fedoraproject.org -openqa-a64-worker05.iad2.fedoraproject.org -openqa-a64-worker06.iad2.fedoraproject.org +bvmhost-a64-01.stg.rdu3.fedoraproject.org +openqa-a64-worker01.rdu3.fedoraproject.org +openqa-a64-worker02.rdu3.fedoraproject.org [storinator] storinator01.rdu-cc.fedoraproject.org [aarch64] -buildhw-a64-03.iad2.fedoraproject.org -buildhw-a64-04.iad2.fedoraproject.org -buildhw-a64-05.iad2.fedoraproject.org -buildhw-a64-06.iad2.fedoraproject.org -openqa-a64-worker01.iad2.fedoraproject.org -openqa-a64-worker02.iad2.fedoraproject.org -openqa-a64-worker03.iad2.fedoraproject.org -openqa-a64-worker05.iad2.fedoraproject.org -openqa-a64-worker06.iad2.fedoraproject.org +buildhw-a64-03.rdu3.fedoraproject.org +buildhw-a64-04.rdu3.fedoraproject.org +buildhw-a64-05.rdu3.fedoraproject.org +buildhw-a64-06.rdu3.fedoraproject.org +openqa-a64-worker01.rdu3.fedoraproject.org +openqa-a64-worker02.rdu3.fedoraproject.org [mtsnow] -bvmhost-a64-01.iad2.fedoraproject.org -bvmhost-a64-02.iad2.fedoraproject.org -bvmhost-a64-03.iad2.fedoraproject.org -bvmhost-a64-04.iad2.fedoraproject.org -buildhw-a64-03.iad2.fedoraproject.org -buildhw-a64-04.iad2.fedoraproject.org -buildhw-a64-05.iad2.fedoraproject.org -buildhw-a64-06.iad2.fedoraproject.org -openqa-a64-worker04.iad2.fedoraproject.org +bvmhost-a64-01.rdu3.fedoraproject.org +bvmhost-a64-02.rdu3.fedoraproject.org +bvmhost-a64-03.rdu3.fedoraproject.org +bvmhost-a64-04.rdu3.fedoraproject.org +buildhw-a64-03.rdu3.fedoraproject.org +buildhw-a64-04.rdu3.fedoraproject.org +buildhw-a64-05.rdu3.fedoraproject.org +buildhw-a64-06.rdu3.fedoraproject.org [riscv] bvmhost-x86-riscv01.rdu3.fedoraproject.org diff --git a/inventory/host_vars/autosign01.iad2.fedoraproject.org b/inventory/host_vars/autosign01.iad2.fedoraproject.org deleted file mode 100644 index a43f2308cd..0000000000 --- a/inventory/host_vars/autosign01.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1_ipv4: 10.3.169.28 -eno1_ipv4_gw: 10.3.169.254 -eno1_ipv4_nm: 24 -eno1_mac: "{{ mac1 }}" -external: false -has_ipv4: yes -mac1: ec:f4:bb:d2:85:48 -mac2: ec:f4:bb:d2:85:4a -mac3: ec:f4:bb:d2:85:4c -mac4: ec:f4:bb:d2:85:4d -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1_ipv4 }}/{{ eno1_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1_ipv4_gw }}" - mac: "{{ eno1_mac }}" - name: eno1 - state: up - type: ethernet diff --git a/inventory/host_vars/autosign01.rdu3.fedoraproject.org b/inventory/host_vars/autosign01.rdu3.fedoraproject.org index 9d8a81b6c9..10e5d3d303 100644 --- a/inventory/host_vars/autosign01.rdu3.fedoraproject.org +++ b/inventory/host_vars/autosign01.rdu3.fedoraproject.org @@ -7,7 +7,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: C4:CB:E1:E1:61:10 mac1: C4:CB:E1:E1:61:11 diff --git a/inventory/host_vars/autosign01.stg.iad2.fedoraproject.org b/inventory/host_vars/autosign01.stg.iad2.fedoraproject.org deleted file mode 100644 index bb8594c6b0..0000000000 --- a/inventory/host_vars/autosign01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.29 -external: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: bvmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/autosign02.iad2.fedoraproject.org b/inventory/host_vars/autosign02.iad2.fedoraproject.org deleted file mode 100644 index bafb339015..0000000000 --- a/inventory/host_vars/autosign02.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth1_ipv4: 10.3.169.47 -eth1_ipv4_gw: 10.3.169.254 -eth1_ipv4_nm: 24 -eth1_mac: "{{ mac3 }}" -external: false -has_ipv4: yes -mac1: C8:4B:D6:83:16:22 -mac2: C8:4B:D6:83:16:23 -mac3: 6C:FE:54:57:4D:80 -mac4: 6C:FE:54:57:4D:81 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth1_ipv4_gw }}" - mac: "{{ eth1_mac }}" - name: eth1 - state: up - type: ethernet diff --git a/inventory/host_vars/backup01.iad2.fedoraproject.org b/inventory/host_vars/backup01.iad2.fedoraproject.org deleted file mode 100644 index e613d55ff2..0000000000 --- a/inventory/host_vars/backup01.iad2.fedoraproject.org +++ /dev/null @@ -1,34 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.3.163.40 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_nm: 24 -eth0_mac: "{{ mac0 }}" -grokmirror_topdir: /fedora_backups/grokmirror -has_ipv4: yes -mac0: 6c:fe:54:57:4d:00 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ eth0_mac }}" - name: eth0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -weblate_backup_topdir: /fedora_backups/misc/weblate diff --git a/inventory/host_vars/backup01.rdu3.fedoraproject.org b/inventory/host_vars/backup01.rdu3.fedoraproject.org index 0b5b32272c..2ad95e4dc0 100644 --- a/inventory/host_vars/backup01.rdu3.fedoraproject.org +++ b/inventory/host_vars/backup01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" grokmirror_topdir: /fedora_backups/grokmirror has_ipv4: yes mac0: c4:cb:e1:e1:61:64 diff --git a/inventory/host_vars/bastion01.iad2.fedoraproject.org b/inventory/host_vars/bastion01.iad2.fedoraproject.org deleted file mode 100644 index 2bb109bb22..0000000000 --- a/inventory/host_vars/bastion01.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.31 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -ssh_hostnames: - - bastion.fedoraproject.org - - bastion01.fedoraproject.org -vmhost: vmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/bastion01.rdu3.fedoraproject.org b/inventory/host_vars/bastion01.rdu3.fedoraproject.org index 46cd5d9176..ff31add009 100644 --- a/inventory/host_vars/bastion01.rdu3.fedoraproject.org +++ b/inventory/host_vars/bastion01.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.31 eth0_ipv6_gw: 2620:52:6:1121::1 diff --git a/inventory/host_vars/bastion02.iad2.fedoraproject.org b/inventory/host_vars/bastion02.iad2.fedoraproject.org deleted file mode 100644 index 480c154abf..0000000000 --- a/inventory/host_vars/bastion02.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.32 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -ssh_hostnames: - - bastion.fedoraproject.org - - bastion02.fedoraproject.org -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/bastion02.rdu3.fedoraproject.org b/inventory/host_vars/bastion02.rdu3.fedoraproject.org index 6b06fe99b1..074e908dac 100644 --- a/inventory/host_vars/bastion02.rdu3.fedoraproject.org +++ b/inventory/host_vars/bastion02.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.32 eth0_ipv6_gw: 2620:52:6:1121::1 diff --git a/inventory/host_vars/batcave01.iad2.fedoraproject.org b/inventory/host_vars/batcave01.iad2.fedoraproject.org deleted file mode 100644 index 12a5ee4313..0000000000 --- a/inventory/host_vars/batcave01.iad2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.35 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -sar_output_file: koji.json -#host_backup_targets: ['/git', '/mnt/fedora/app/attachments'] - -# GDPR SAR variables - koji -sar_script: /usr/local/bin/koji_sar.py -sar_script_user: root -# Add VPN host name as alt name for SSH cert. Useful when you need to -# SSH into batcave through VPN, like from bastion in a different DC. -ssh_hostnames: - - batcave01.vpn.fedoraproject.org -vmhost: vmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/bkernel01.iad2.fedoraproject.org b/inventory/host_vars/bkernel01.iad2.fedoraproject.org deleted file mode 100644 index da2d5146b1..0000000000 --- a/inventory/host_vars/bkernel01.iad2.fedoraproject.org +++ /dev/null @@ -1,29 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4_ip: 10.3.169.29 -eth0_ipv4_gw: 10.3.169.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -mac0: B4:45:06:FB:84:2E -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ eth0_mac }}" - name: eth0 - state: up - type: ethernet -resolvconf: "resolv.conf/iad2" diff --git a/inventory/host_vars/bkernel02.iad2.fedoraproject.org b/inventory/host_vars/bkernel02.iad2.fedoraproject.org deleted file mode 100644 index 0e6d582a2f..0000000000 --- a/inventory/host_vars/bkernel02.iad2.fedoraproject.org +++ /dev/null @@ -1,30 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4_ip: 10.3.169.30 -eth0_ipv4_gw: 10.3.169.254 -eth0_mac: "{{ mac0 }}" -external: false -has_ipv4: yes -mac0: b4:45:06:fb:83:4e -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ eth0_mac }}" - name: eth0 - state: up - type: ethernet -resolvconf: "resolv.conf/iad2" diff --git a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org deleted file mode 100644 index f32f9490eb..0000000000 --- a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org +++ /dev/null @@ -1,20 +0,0 @@ ---- -# These set a config value, see roles/bodhi2/base/ -bodhi_masher_enabled: True -bodhi_signed_handler_enabled: False -bodhi_updates_handler_enabled: False -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.101 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -max_mem_size: 98304 -mem_size: 98304 -num_cpus: 30 -sar_output_file: bodhi.json -# GDPR SAR variables -sar_script: /usr/bin/bodhi-sar -sar_script_user: apache -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: bvmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org deleted file mode 100644 index e0295ed7ba..0000000000 --- a/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -# These are consumed by a task in roles/fedmsg/base/main.yml -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.32 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/bootstrap.ocp.iad2.fedoraproject.org b/inventory/host_vars/bootstrap.ocp.iad2.fedoraproject.org deleted file mode 100644 index 2b0f855aee..0000000000 --- a/inventory/host_vars/bootstrap.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,47 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.126 -eth0_ipv4_gw: 10.3.163.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/bootstrap.ign" -rhcos_install_img_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/bootstrap.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/bootstrap.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index ac29f65e74..0000000000 --- a/inventory/host_vars/bootstrap.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,24 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.121 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -max_mem_size: 24576 -mem_size: 24576 -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/bootstrap.ign" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org deleted file mode 100644 index 92d41fd551..0000000000 --- a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -eth1_ip: 10.3.170.123 -eth1_ipv4_gw: 10.3.170.254 -gw: 10.3.170.254 -network_connections: - - autoconnect: no - mac: d8:5e:d3:8b:5f:70 - name: eth0 - type: ethernet - - autoconnect: no - mac: d8:5e:d3:8b:5f:71 - name: eth1 - type: ethernet - - autoconnect: yes - ip: - address: 10.3.170.123/24 - dhcp4: no - dns: - - 10.3.163.33 - - 10.3.163.34 - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: 10.3.170.254 - mac: 0c:42:a1:4a:0b:f4 - name: eth2 - state: up - type: ethernet - - autoconnect: no - mac: 0c:42:a1:4a:0b:f5 - name: eth3 - type: ethernet diff --git a/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org deleted file mode 100644 index 41c3b37d7a..0000000000 --- a/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -eth1_ip: 10.3.170.124 -eth1_ipv4_gw: 10.3.170.254 -gw: 10.3.170.254 -network_connections: - - autoconnect: no - mac: d8:5e:d3:8b:5d:d8 - name: eth0 - type: ethernet - - autoconnect: no - mac: d8:5e:d3:8b:5d:d9 - name: eth1 - type: ethernet - - autoconnect: yes - ip: - address: 10.3.170.124/24 - dhcp4: no - dns: - - 10.3.163.33 - - 10.3.163.34 - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: 10.3.170.254 - mac: 0c:42:a1:49:9b:d0 - name: eth2 - state: up - type: ethernet - - autoconnect: no - mac: 0c:42:a1:49:9b:d1 - name: eth3 - type: ethernet diff --git a/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org deleted file mode 100644 index 9f96a47840..0000000000 --- a/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -eth1_ip: 10.3.170.125 -eth1_ipv4_gw: 10.3.170.254 -gw: 10.3.170.254 -network_connections: - - autoconnect: no - mac: d8:5e:d3:8b:89:6c - name: eth0 - type: ethernet - - autoconnect: no - mac: d8:5e:d3:8b:89:6d - name: eth1 - type: ethernet - - autoconnect: yes - ip: - address: 10.3.170.125/24 - dhcp4: no - dns: - - 10.3.163.33 - - 10.3.163.34 - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: 10.3.170.254 - mac: 0c:42:a1:5a:00:b8 - name: eth2 - state: up - type: ethernet - - autoconnect: no - mac: 0c:42:a1:5a:00:b9 - name: eth3 - type: ethernet diff --git a/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org deleted file mode 100644 index f30f067e47..0000000000 --- a/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -eth1_ip: 10.3.170.126 -eth1_ipv4_gw: 10.3.170.254 -gw: 10.3.170.254 -network_connections: - - autoconnect: no - mac: d8:5e:d3:8b:5f:38 - name: eth0 - type: ethernet - - autoconnect: no - mac: d8:5e:d3:8b:5f:39 - name: eth1 - type: ethernet - - autoconnect: yes - ip: - address: 10.3.170.126/24 - dhcp4: no - dns: - - 10.3.163.33 - - 10.3.163.34 - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: 10.3.170.254 - mac: 0c:42:a1:45:6c:fc - name: eth2 - state: up - type: ethernet - - autoconnect: no - mac: 0c:42:a1:45:6c:fd - name: eth3 - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org deleted file mode 100644 index 93351897e2..0000000000 --- a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org +++ /dev/null @@ -1,30 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -eth0_ipv4: 10.3.169.31 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:9e:61 -mac1: 14:9e:cf:61:9e:64 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org deleted file mode 100644 index 15362138b1..0000000000 --- a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org +++ /dev/null @@ -1,34 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.32 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:9f:4f -mac1: 14:9e:cf:61:9f:52 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - persistent_state: present - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - persistent_state: present - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org deleted file mode 100644 index 309250c182..0000000000 --- a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.33 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:9e:c9 -mac1: 14:9e:cf:61:9e:cc -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org deleted file mode 100644 index 80819a35c2..0000000000 --- a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.34 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:a5:07 -mac1: 14:9e:cf:61:a5:0a -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org deleted file mode 100644 index e65f5a0cc6..0000000000 --- a/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org +++ /dev/null @@ -1,33 +0,0 @@ ---- -datacenter: iad2 -dns: 10.3.163.33 -dns1: 10.3.163.33 -eth0_ip: 10.3.169.35 -eth0_ipv4: 10.3.169.35 -eth0_ipv4_gw: 10.3.169.254 -eth1_off: true -gw: 10.3.169.254 -mac0: 14:9e:cf:61:9e:7b -mac1: 14:9e:cf:61:9e:7e -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet -nm: 255.255.255.0 diff --git a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org deleted file mode 100644 index 9cba3ef912..0000000000 --- a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.36 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:a0:bd -mac1: 14:9e:cf:61:a0:c0 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org deleted file mode 100644 index 4b755380be..0000000000 --- a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.37 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:9e:e3 -mac1: 14:9e:cf:61:9e:e6 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org deleted file mode 100644 index 51e17059e6..0000000000 --- a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.38 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: 14:9e:cf:61:a6:75 -mac1: 14:9e:cf:61:a6:78 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org deleted file mode 100644 index 415a2a7cf6..0000000000 --- a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.39 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:26:e1 -mac1: f8:ca:b8:f7:26:e4 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org deleted file mode 100644 index f8ddaf2826..0000000000 --- a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.40 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:27:cf -mac1: f8:ca:b8:f7:27:d2 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org deleted file mode 100644 index 41cf9f2dd6..0000000000 --- a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.41 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:27:63 -mac1: f8:ca:b8:f7:27:66 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org deleted file mode 100644 index ee35ca5168..0000000000 --- a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.42 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:2e:f5 -mac1: f8:ca:b8:f7:2e:f8 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org deleted file mode 100644 index 4efecb0a0f..0000000000 --- a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.43 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:27:49 -mac1: f8:ca:b8:f7:27:4c -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org deleted file mode 100644 index 406210a081..0000000000 --- a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.44 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:2d:87 -mac1: f8:ca:b8:f7:2d:8a -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org deleted file mode 100644 index b1eefdf863..0000000000 --- a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.45 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:26:fb -mac1: f8:ca:b8:f7:26:fe -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org deleted file mode 100644 index 08cc65044a..0000000000 --- a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -eth0_ipv4: 10.3.169.46 -eth0_ipv4_gw: 10.3.169.254 -has_ipv4: yes -has_ipv6: no -mac0: f8:ca:b8:f7:29:3d -mac1: f8:ca:b8:f7:29:40 -network_connections: - - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - mtu: 9000 - state: up - type: ethernet - - autoconnect: yes - mac: "{{ mac1 }}" - name: eth1 - state: down - type: ethernet diff --git a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org deleted file mode 100644 index 547ed6fc44..0000000000 --- a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.91 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org deleted file mode 100644 index 5e0485156e..0000000000 --- a/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.45 -vmhost: bvmhost-a64-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org deleted file mode 100644 index 35f51def37..0000000000 --- a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.92 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org deleted file mode 100644 index 29a616c73b..0000000000 --- a/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.52 -vmhost: bvmhost-a64-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org deleted file mode 100644 index 94f0a0ec55..0000000000 --- a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.93 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org deleted file mode 100644 index 1ff276a6d0..0000000000 --- a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.94 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org deleted file mode 100644 index 5addd8d6fe..0000000000 --- a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.95 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org deleted file mode 100644 index 31227aef2a..0000000000 --- a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.96 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org deleted file mode 100644 index c6f84c9704..0000000000 --- a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.97 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org deleted file mode 100644 index 63c47ee6fd..0000000000 --- a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.98 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org deleted file mode 100644 index 907dd05400..0000000000 --- a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.99 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org deleted file mode 100644 index d1926fdcc5..0000000000 --- a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.100 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org deleted file mode 100644 index dc50d580a4..0000000000 --- a/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.101 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org deleted file mode 100644 index 82f032360e..0000000000 --- a/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.102 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org deleted file mode 100644 index abcf11f03e..0000000000 --- a/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.103 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org deleted file mode 100644 index 5073edf903..0000000000 --- a/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.104 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org deleted file mode 100644 index 6077561350..0000000000 --- a/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.105 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org deleted file mode 100644 index 4399c954f0..0000000000 --- a/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.106 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org deleted file mode 100644 index ca795f79bb..0000000000 --- a/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.107 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org deleted file mode 100644 index 89509770d0..0000000000 --- a/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.108 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org deleted file mode 100644 index a64eeed244..0000000000 --- a/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.109 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org deleted file mode 100644 index c805ab185e..0000000000 --- a/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.110 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org deleted file mode 100644 index 0c22ef804a..0000000000 --- a/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.111 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org deleted file mode 100644 index c8703975fd..0000000000 --- a/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.112 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org deleted file mode 100644 index 4bead1814d..0000000000 --- a/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.113 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org deleted file mode 100644 index 6e1218afa3..0000000000 --- a/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.114 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org deleted file mode 100644 index c7fa5875a2..0000000000 --- a/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.115 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org deleted file mode 100644 index f3496508f9..0000000000 --- a/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.116 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org deleted file mode 100644 index 05fc6bc911..0000000000 --- a/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.117 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-28.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-28.iad2.fedoraproject.org deleted file mode 100644 index 9b83fd32d8..0000000000 --- a/inventory/host_vars/buildvm-a64-28.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.170.118 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-29.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-29.iad2.fedoraproject.org deleted file mode 100644 index 56df06665f..0000000000 --- a/inventory/host_vars/buildvm-a64-29.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.170.119 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-30.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-30.iad2.fedoraproject.org deleted file mode 100644 index 604935c460..0000000000 --- a/inventory/host_vars/buildvm-a64-30.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.170.120 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org deleted file mode 100644 index b105cb9a27..0000000000 --- a/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.141 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org deleted file mode 100644 index a4cfaeb00c..0000000000 --- a/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.142 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org deleted file mode 100644 index 092363da86..0000000000 --- a/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.143 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-34.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-34.iad2.fedoraproject.org deleted file mode 100644 index 0f9f6c243d..0000000000 --- a/inventory/host_vars/buildvm-a64-34.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.164 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-35.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-35.iad2.fedoraproject.org deleted file mode 100644 index d00bb68df9..0000000000 --- a/inventory/host_vars/buildvm-a64-35.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.165 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-36.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-36.iad2.fedoraproject.org deleted file mode 100644 index c2f51768d8..0000000000 --- a/inventory/host_vars/buildvm-a64-36.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.166 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-37.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-37.iad2.fedoraproject.org deleted file mode 100644 index 090ba50298..0000000000 --- a/inventory/host_vars/buildvm-a64-37.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.167 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-38.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-38.iad2.fedoraproject.org deleted file mode 100644 index ecaa4919d3..0000000000 --- a/inventory/host_vars/buildvm-a64-38.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.168 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-39.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-39.iad2.fedoraproject.org deleted file mode 100644 index 31cbc4d03e..0000000000 --- a/inventory/host_vars/buildvm-a64-39.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.169 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-a64-40.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-40.iad2.fedoraproject.org deleted file mode 100644 index bf74adf3a7..0000000000 --- a/inventory/host_vars/buildvm-a64-40.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.170 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org deleted file mode 100644 index fa37b91f97..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.41 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org deleted file mode 100644 index 9b57e1837c..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.47 -vmhost: bvmhost-p09-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org deleted file mode 100644 index 32639b5acc..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.42 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org deleted file mode 100644 index 138df5dd92..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.48 -vmhost: bvmhost-p09-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org deleted file mode 100644 index dab353088c..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.43 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org deleted file mode 100644 index d039b3ddc9..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.49 -vmhost: bvmhost-p09-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org deleted file mode 100644 index 30b99e5466..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.44 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org deleted file mode 100644 index 522cda42a6..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.50 -vmhost: bvmhost-p09-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org deleted file mode 100644 index 8b03aef715..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.45 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org deleted file mode 100644 index 48b48f1203..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,5 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.167.51 -lvm_size: 135000 -vmhost: bvmhost-p09-01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org deleted file mode 100644 index 9a21cdee17..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.46 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org deleted file mode 100644 index b93581d69a..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.47 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org deleted file mode 100644 index 52e805b139..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.48 -vmhost: bvmhost-p09-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org deleted file mode 100644 index 004fecc12e..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.49 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org deleted file mode 100644 index d8d5c06a2e..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.50 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org deleted file mode 100644 index 6c68ccc659..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.51 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org deleted file mode 100644 index 3e3bd99711..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.52 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org deleted file mode 100644 index 81dbf95072..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.53 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org deleted file mode 100644 index a73fea36ea..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.54 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org deleted file mode 100644 index 9567400ff1..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.55 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org deleted file mode 100644 index 8cbd4af77d..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.56 -vmhost: bvmhost-p09-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org deleted file mode 100644 index 2d3feddb8e..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.57 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org deleted file mode 100644 index 2ba48dca3e..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.58 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org deleted file mode 100644 index 2e6d6cc328..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.59 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org deleted file mode 100644 index df852b3179..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.60 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org deleted file mode 100644 index d96251767d..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.61 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org deleted file mode 100644 index 9685b0b51b..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.62 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org deleted file mode 100644 index 65c1843a6b..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.63 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org deleted file mode 100644 index 349376f459..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.64 -vmhost: bvmhost-p09-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org deleted file mode 100644 index 7dfb729dd0..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.65 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org deleted file mode 100644 index 2fcb366ec4..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.66 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org deleted file mode 100644 index ee25d50be7..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.67 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org deleted file mode 100644 index 08bdb1e2e8..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.68 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org deleted file mode 100644 index 357a6c3f4f..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.69 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org deleted file mode 100644 index 2ce21a944d..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.70 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org deleted file mode 100644 index 5e57f49b6a..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.71 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org deleted file mode 100644 index 136be89a51..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.72 -vmhost: bvmhost-p09-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org deleted file mode 100644 index 47c6833805..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.73 -vmhost: bvmhost-p09-05.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-01.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-01.rdu3.fedoraproject.org deleted file mode 100644 index 547ed6fc44..0000000000 --- a/inventory/host_vars/buildvm-rdu3-01.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.91 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-02.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-02.rdu3.fedoraproject.org deleted file mode 100644 index 35f51def37..0000000000 --- a/inventory/host_vars/buildvm-rdu3-02.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.92 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-03.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-03.rdu3.fedoraproject.org deleted file mode 100644 index 94f0a0ec55..0000000000 --- a/inventory/host_vars/buildvm-rdu3-03.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.93 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-04.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-04.rdu3.fedoraproject.org deleted file mode 100644 index 1ff276a6d0..0000000000 --- a/inventory/host_vars/buildvm-rdu3-04.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.94 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-05.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-05.rdu3.fedoraproject.org deleted file mode 100644 index 5addd8d6fe..0000000000 --- a/inventory/host_vars/buildvm-rdu3-05.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.95 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-06.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-06.rdu3.fedoraproject.org deleted file mode 100644 index 31227aef2a..0000000000 --- a/inventory/host_vars/buildvm-rdu3-06.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.96 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-07.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-07.rdu3.fedoraproject.org deleted file mode 100644 index c6f84c9704..0000000000 --- a/inventory/host_vars/buildvm-rdu3-07.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.97 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-08.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-08.rdu3.fedoraproject.org deleted file mode 100644 index 63c47ee6fd..0000000000 --- a/inventory/host_vars/buildvm-rdu3-08.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.98 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-09.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-09.rdu3.fedoraproject.org deleted file mode 100644 index 907dd05400..0000000000 --- a/inventory/host_vars/buildvm-rdu3-09.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.99 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-10.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-10.rdu3.fedoraproject.org deleted file mode 100644 index d1926fdcc5..0000000000 --- a/inventory/host_vars/buildvm-rdu3-10.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.100 -vmhost: bvmhost-a64-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-11.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-11.rdu3.fedoraproject.org deleted file mode 100644 index dc50d580a4..0000000000 --- a/inventory/host_vars/buildvm-rdu3-11.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.101 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-12.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-12.rdu3.fedoraproject.org deleted file mode 100644 index 82f032360e..0000000000 --- a/inventory/host_vars/buildvm-rdu3-12.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.102 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-13.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-13.rdu3.fedoraproject.org deleted file mode 100644 index abcf11f03e..0000000000 --- a/inventory/host_vars/buildvm-rdu3-13.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.103 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-14.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-14.rdu3.fedoraproject.org deleted file mode 100644 index 5073edf903..0000000000 --- a/inventory/host_vars/buildvm-rdu3-14.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.104 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-15.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-15.rdu3.fedoraproject.org deleted file mode 100644 index 6077561350..0000000000 --- a/inventory/host_vars/buildvm-rdu3-15.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.105 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-16.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-16.rdu3.fedoraproject.org deleted file mode 100644 index 4399c954f0..0000000000 --- a/inventory/host_vars/buildvm-rdu3-16.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.106 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-17.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-17.rdu3.fedoraproject.org deleted file mode 100644 index ca795f79bb..0000000000 --- a/inventory/host_vars/buildvm-rdu3-17.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.107 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-18.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-18.rdu3.fedoraproject.org deleted file mode 100644 index 89509770d0..0000000000 --- a/inventory/host_vars/buildvm-rdu3-18.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.108 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-19.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-19.rdu3.fedoraproject.org deleted file mode 100644 index a64eeed244..0000000000 --- a/inventory/host_vars/buildvm-rdu3-19.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.109 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-20.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-20.rdu3.fedoraproject.org deleted file mode 100644 index c805ab185e..0000000000 --- a/inventory/host_vars/buildvm-rdu3-20.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.110 -vmhost: bvmhost-a64-02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-21.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-21.rdu3.fedoraproject.org deleted file mode 100644 index 0c22ef804a..0000000000 --- a/inventory/host_vars/buildvm-rdu3-21.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.111 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-22.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-22.rdu3.fedoraproject.org deleted file mode 100644 index c8703975fd..0000000000 --- a/inventory/host_vars/buildvm-rdu3-22.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.112 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-23.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-23.rdu3.fedoraproject.org deleted file mode 100644 index 4bead1814d..0000000000 --- a/inventory/host_vars/buildvm-rdu3-23.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.113 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-24.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-24.rdu3.fedoraproject.org deleted file mode 100644 index 6e1218afa3..0000000000 --- a/inventory/host_vars/buildvm-rdu3-24.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.114 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-25.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-25.rdu3.fedoraproject.org deleted file mode 100644 index c7fa5875a2..0000000000 --- a/inventory/host_vars/buildvm-rdu3-25.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.115 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-26.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-26.rdu3.fedoraproject.org deleted file mode 100644 index f3496508f9..0000000000 --- a/inventory/host_vars/buildvm-rdu3-26.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.116 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-27.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-27.rdu3.fedoraproject.org deleted file mode 100644 index 05fc6bc911..0000000000 --- a/inventory/host_vars/buildvm-rdu3-27.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.117 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-28.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-28.rdu3.fedoraproject.org deleted file mode 100644 index 9b83fd32d8..0000000000 --- a/inventory/host_vars/buildvm-rdu3-28.rdu3.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.170.118 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-29.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-29.rdu3.fedoraproject.org deleted file mode 100644 index 56df06665f..0000000000 --- a/inventory/host_vars/buildvm-rdu3-29.rdu3.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.170.119 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-30.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-30.rdu3.fedoraproject.org deleted file mode 100644 index 604935c460..0000000000 --- a/inventory/host_vars/buildvm-rdu3-30.rdu3.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.170.120 -vmhost: bvmhost-a64-03.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-31.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-31.rdu3.fedoraproject.org deleted file mode 100644 index b105cb9a27..0000000000 --- a/inventory/host_vars/buildvm-rdu3-31.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.141 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-32.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-32.rdu3.fedoraproject.org deleted file mode 100644 index a4cfaeb00c..0000000000 --- a/inventory/host_vars/buildvm-rdu3-32.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.142 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-33.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-33.rdu3.fedoraproject.org deleted file mode 100644 index 092363da86..0000000000 --- a/inventory/host_vars/buildvm-rdu3-33.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.143 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-34.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-34.rdu3.fedoraproject.org deleted file mode 100644 index 0f9f6c243d..0000000000 --- a/inventory/host_vars/buildvm-rdu3-34.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.164 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-35.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-35.rdu3.fedoraproject.org deleted file mode 100644 index d00bb68df9..0000000000 --- a/inventory/host_vars/buildvm-rdu3-35.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.165 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-36.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-36.rdu3.fedoraproject.org deleted file mode 100644 index c2f51768d8..0000000000 --- a/inventory/host_vars/buildvm-rdu3-36.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.166 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-37.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-37.rdu3.fedoraproject.org deleted file mode 100644 index 090ba50298..0000000000 --- a/inventory/host_vars/buildvm-rdu3-37.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.167 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-38.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-38.rdu3.fedoraproject.org deleted file mode 100644 index ecaa4919d3..0000000000 --- a/inventory/host_vars/buildvm-rdu3-38.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.168 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-39.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-39.rdu3.fedoraproject.org deleted file mode 100644 index 31cbc4d03e..0000000000 --- a/inventory/host_vars/buildvm-rdu3-39.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.169 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-rdu3-40.rdu3.fedoraproject.org b/inventory/host_vars/buildvm-rdu3-40.rdu3.fedoraproject.org deleted file mode 100644 index bf74adf3a7..0000000000 --- a/inventory/host_vars/buildvm-rdu3-40.rdu3.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.170.170 -vmhost: bvmhost-a64-04.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-01.iad2.fedoraproject.org deleted file mode 100644 index 69f785c3b9..0000000000 --- a/inventory/host_vars/buildvm-x86-01.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.51 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-01.stg.iad2.fedoraproject.org deleted file mode 100644 index aaafbbd0ea..0000000000 --- a/inventory/host_vars/buildvm-x86-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.167.21 -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-02.iad2.fedoraproject.org deleted file mode 100644 index e9d5a23380..0000000000 --- a/inventory/host_vars/buildvm-x86-02.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.52 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-02.stg.iad2.fedoraproject.org deleted file mode 100644 index f617e239bd..0000000000 --- a/inventory/host_vars/buildvm-x86-02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.167.22 -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-03.iad2.fedoraproject.org deleted file mode 100644 index e77ca2c96f..0000000000 --- a/inventory/host_vars/buildvm-x86-03.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.53 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-03.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-03.stg.iad2.fedoraproject.org deleted file mode 100644 index 18b07f6a9b..0000000000 --- a/inventory/host_vars/buildvm-x86-03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.167.23 -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-04.iad2.fedoraproject.org deleted file mode 100644 index 3dfcc221a8..0000000000 --- a/inventory/host_vars/buildvm-x86-04.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.54 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-04.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-04.stg.iad2.fedoraproject.org deleted file mode 100644 index 4ced4f3ee0..0000000000 --- a/inventory/host_vars/buildvm-x86-04.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.167.24 -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-05.iad2.fedoraproject.org deleted file mode 100644 index 13c6fa6f7c..0000000000 --- a/inventory/host_vars/buildvm-x86-05.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.55 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-05.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-05.stg.iad2.fedoraproject.org deleted file mode 100644 index 125b32cf9b..0000000000 --- a/inventory/host_vars/buildvm-x86-05.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -eth0_ipv4_ip: 10.3.167.25 -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-06.iad2.fedoraproject.org deleted file mode 100644 index a0c35f4622..0000000000 --- a/inventory/host_vars/buildvm-x86-06.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.56 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-07.iad2.fedoraproject.org deleted file mode 100644 index b7e552746e..0000000000 --- a/inventory/host_vars/buildvm-x86-07.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.57 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-08.iad2.fedoraproject.org deleted file mode 100644 index 51b7c85e61..0000000000 --- a/inventory/host_vars/buildvm-x86-08.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.58 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-09.iad2.fedoraproject.org deleted file mode 100644 index 4519bfbd2f..0000000000 --- a/inventory/host_vars/buildvm-x86-09.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.59 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-10.iad2.fedoraproject.org deleted file mode 100644 index fb176d570e..0000000000 --- a/inventory/host_vars/buildvm-x86-10.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.60 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-11.iad2.fedoraproject.org deleted file mode 100644 index e4affb1aca..0000000000 --- a/inventory/host_vars/buildvm-x86-11.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.61 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-12.iad2.fedoraproject.org deleted file mode 100644 index c221e15ab3..0000000000 --- a/inventory/host_vars/buildvm-x86-12.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.62 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-13.iad2.fedoraproject.org deleted file mode 100644 index 4cf885ea04..0000000000 --- a/inventory/host_vars/buildvm-x86-13.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.63 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-14.iad2.fedoraproject.org deleted file mode 100644 index 9240993850..0000000000 --- a/inventory/host_vars/buildvm-x86-14.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.64 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-15.iad2.fedoraproject.org deleted file mode 100644 index cb47a6e690..0000000000 --- a/inventory/host_vars/buildvm-x86-15.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.65 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-16.iad2.fedoraproject.org deleted file mode 100644 index 9f82fbd196..0000000000 --- a/inventory/host_vars/buildvm-x86-16.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.66 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-06.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-17.iad2.fedoraproject.org deleted file mode 100644 index 73451ed5b7..0000000000 --- a/inventory/host_vars/buildvm-x86-17.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.67 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-18.iad2.fedoraproject.org deleted file mode 100644 index e931375f5e..0000000000 --- a/inventory/host_vars/buildvm-x86-18.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.68 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-19.iad2.fedoraproject.org deleted file mode 100644 index dd4cde5231..0000000000 --- a/inventory/host_vars/buildvm-x86-19.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.69 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-20.iad2.fedoraproject.org deleted file mode 100644 index 5cb11f01ce..0000000000 --- a/inventory/host_vars/buildvm-x86-20.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.70 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-21.iad2.fedoraproject.org deleted file mode 100644 index f4a2e026e1..0000000000 --- a/inventory/host_vars/buildvm-x86-21.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.71 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-22.iad2.fedoraproject.org deleted file mode 100644 index b404245fb8..0000000000 --- a/inventory/host_vars/buildvm-x86-22.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.72 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-23.iad2.fedoraproject.org deleted file mode 100644 index c69be60f71..0000000000 --- a/inventory/host_vars/buildvm-x86-23.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.73 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-24.iad2.fedoraproject.org deleted file mode 100644 index f2e81ab200..0000000000 --- a/inventory/host_vars/buildvm-x86-24.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.74 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-25.iad2.fedoraproject.org deleted file mode 100644 index 482729dbc4..0000000000 --- a/inventory/host_vars/buildvm-x86-25.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.75 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-26.iad2.fedoraproject.org deleted file mode 100644 index 3437e2fa19..0000000000 --- a/inventory/host_vars/buildvm-x86-26.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.76 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-27.iad2.fedoraproject.org deleted file mode 100644 index e964ed86bf..0000000000 --- a/inventory/host_vars/buildvm-x86-27.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.77 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-28.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-28.iad2.fedoraproject.org deleted file mode 100644 index 47c5283bec..0000000000 --- a/inventory/host_vars/buildvm-x86-28.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.78 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-29.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-29.iad2.fedoraproject.org deleted file mode 100644 index 565d6b8b70..0000000000 --- a/inventory/host_vars/buildvm-x86-29.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.79 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-30.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-30.iad2.fedoraproject.org deleted file mode 100644 index d79b256497..0000000000 --- a/inventory/host_vars/buildvm-x86-30.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.80 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-31.iad2.fedoraproject.org deleted file mode 100644 index 23be3d6c36..0000000000 --- a/inventory/host_vars/buildvm-x86-31.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.81 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-32.iad2.fedoraproject.org deleted file mode 100644 index f730063097..0000000000 --- a/inventory/host_vars/buildvm-x86-32.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.82 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-riscv01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-riscv01.iad2.fedoraproject.org deleted file mode 100644 index 329a37e638..0000000000 --- a/inventory/host_vars/buildvm-x86-riscv01.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.172.254 -eth0_ipv4_ip: 10.3.172.23 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-riscv01.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-x86-riscv02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-x86-riscv02.iad2.fedoraproject.org deleted file mode 100644 index 61297c1a6f..0000000000 --- a/inventory/host_vars/buildvm-x86-riscv02.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.172.254 -eth0_ipv4_ip: 10.3.172.24 -ipa_server: ipa01.iad2.fedoraproject.org -resolvconf: "resolv.conf/iad2" -vmhost: bvmhost-x86-riscv01.iad2.fedoraproject.org diff --git a/inventory/host_vars/busgateway01.iad2.fedoraproject.org b/inventory/host_vars/busgateway01.iad2.fedoraproject.org deleted file mode 100644 index 1e1a93f15b..0000000000 --- a/inventory/host_vars/busgateway01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.46 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-iad2 -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org b/inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org deleted file mode 100644 index 02e982ba93..0000000000 --- a/inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.38 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-iad2 -vmhost: vmhost-x86-09.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org deleted file mode 100644 index 048e64cc4d..0000000000 --- a/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -br0_ipv4: 10.3.170.11 -br0_ipv4_gw: 10.3.170.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 0c:42:a1:52:1a:dc -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 4500 -nrpe_procs_warn: 4000 diff --git a/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org deleted file mode 100644 index 1d9d85c1d5..0000000000 --- a/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,39 +0,0 @@ ---- -br0_ipv4: 10.3.167.16 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac1: 0c:42:a1:c2:5d:a6 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 3500 -nrpe_procs_warn: 3000 diff --git a/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org deleted file mode 100644 index 19480c4033..0000000000 --- a/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -br0_ipv4: 10.3.170.12 -br0_ipv4_gw: 10.3.170.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 04:3f:72:d7:7a:a6 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 4500 -nrpe_procs_warn: 4000 diff --git a/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org deleted file mode 100644 index 89d8871520..0000000000 --- a/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -br0_ipv4: 10.3.170.13 -br0_ipv4_gw: 10.3.170.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: b8:ce:f6:04:74:d8 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 4500 -nrpe_procs_warn: 4000 diff --git a/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org deleted file mode 100644 index 14ab92de1f..0000000000 --- a/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -br0_ipv4: 10.3.170.14 -br0_ipv4_gw: 10.3.170.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 04:3f:72:d7:7f:f7 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 4500 -nrpe_procs_warn: 4000 diff --git a/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org deleted file mode 100644 index a74ee86e21..0000000000 --- a/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.170.21 -br0_ipv4_gw: 10.3.170.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 50:6b:4b:6a:b7:f0 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org deleted file mode 100644 index 2d20c6a926..0000000000 --- a/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -br0_ipv4: 10.3.171.15 -br0_ipv4_gw: 10.3.171.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 40:a6:b7:18:8a:38 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 13000 -nrpe_procs_warn: 12000 diff --git a/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org deleted file mode 100644 index 1b077f2a14..0000000000 --- a/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,39 +0,0 @@ ---- -br0_ipv4: 10.3.167.19 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac3: b8:ce:f6:88:9a:de -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 13000 -nrpe_procs_warn: 12000 diff --git a/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org deleted file mode 100644 index 97a84810f5..0000000000 --- a/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.171.16 -br0_ipv4_gw: 10.3.171.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac2 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: ac:1f:6b:56:e9:11 -mac2: 40:a6:b7:18:86:b4 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 13000 -nrpe_procs_warn: 12000 diff --git a/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org deleted file mode 100644 index 1736145892..0000000000 --- a/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -br0_ipv4: 10.3.171.17 -br0_ipv4_gw: 10.3.171.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 40:a6:b7:18:85:74 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 13000 -nrpe_procs_warn: 12000 diff --git a/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org deleted file mode 100644 index 24f37c00ef..0000000000 --- a/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org +++ /dev/null @@ -1,39 +0,0 @@ ---- -br0_ipv4_ip: 10.3.171.18 -br0_ipv4_gw: 10.3.171.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac2 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 40:a6:b7:18:85:74 -mac2: 40:a6:b7:18:86:c8 -nbde: false -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4_ip }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 13000 -nrpe_procs_warn: 12000 diff --git a/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org deleted file mode 100644 index 1bc5bc9f36..0000000000 --- a/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.171.21 -br0_ipv4_gw: 10.3.171.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac2 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac2: b8:ce:f6:c5:ff:66 -nbde: false -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 13000 -nrpe_procs_warn: 12000 diff --git a/inventory/host_vars/bvmhost-p10-01.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-p10-01.rdu3.fedoraproject.org index 2f0727fbe1..6c6e552295 100644 --- a/inventory/host_vars/bvmhost-p10-01.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-p10-01.rdu3.fedoraproject.org @@ -10,7 +10,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: b8:e9:24:23:e5:b4 mac1: b8:e9:24:23:e5:b5 diff --git a/inventory/host_vars/bvmhost-s390x-01.s390.fedoraproject.org b/inventory/host_vars/bvmhost-s390x-01.s390.fedoraproject.org index 1333237e0d..fa78e7a352 100644 --- a/inventory/host_vars/bvmhost-s390x-01.s390.fedoraproject.org +++ b/inventory/host_vars/bvmhost-s390x-01.s390.fedoraproject.org @@ -1,5 +1,5 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: iad2.fedoraproject.org +dns1: 10.16.163.33 +dns2: 10.16.163.34 +dns_search1: rdu3.fedoraproject.org nbde: false diff --git a/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org b/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org index 1130e0fd33..9d12124e7c 100644 --- a/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org +++ b/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org @@ -1,6 +1,6 @@ --- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: iad2.fedoraproject.org +datacenter: rdu3 +dns1: 10.16.163.33 +dns2: 10.16.163.34 +dns_search1: rdu3.fedoraproject.org nbde: false diff --git a/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org deleted file mode 100644 index d9c0a7ea8a..0000000000 --- a/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.169.11 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:05:54 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-01.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-01.rdu3.fedoraproject.org index 0002a6ea37..5081fc1019 100644 --- a/inventory/host_vars/bvmhost-x86-01.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: C4:CB:E1:E1:57:0A mac1: C4:CB:E1:E1:57:0B diff --git a/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org deleted file mode 100644 index a362963f62..0000000000 --- a/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,40 +0,0 @@ ---- -br0_ipv4: 10.3.167.11 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac1: 24:6e:96:b1:56:24 -mac2: 24:6e:96:b1:56:25 -mac3: 24:6e:96:b1:56:20 -mac4: 24:6e:96:b1:56:22 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-01.stg.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-01.stg.rdu3.fedoraproject.org index b0ad620c6d..35e14f5b7d 100644 --- a/inventory/host_vars/bvmhost-x86-01.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-01.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:60:16 mac1: c4:cb:e1:e1:60:17 diff --git a/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org deleted file mode 100644 index 1072dbbc70..0000000000 --- a/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.169.12 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:69:fe -mac2: e4:43:4b:b1:6a:00 -mac3: e4:43:4b:b1:6a:1e -mac4: e4:43:4b:b1:6a:1f -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-02.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.rdu3.fedoraproject.org index b5ccdc86dc..35ead5ee13 100644 --- a/inventory/host_vars/bvmhost-x86-02.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-02.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:5f:c8 mac1: c4:cb:e1:e1:5f:c9 diff --git a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org deleted file mode 100644 index 21446110de..0000000000 --- a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,40 +0,0 @@ ---- -br0_ipv4: 10.3.167.12 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac1: C8:4B:D6:88:FB:C6 -mac2: C8:4B:D6:88:FB:C7 -mac3: 6C:FE:54:57:5F:48 -mac4: 6C:FE:54:57:5F:49 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-02.stg.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.stg.rdu3.fedoraproject.org index 095672fe80..7b3ed13925 100644 --- a/inventory/host_vars/bvmhost-x86-02.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-02.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:56:fe mac1: c4:cb:e1:e1:56:ff diff --git a/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org deleted file mode 100644 index c7704ccf6b..0000000000 --- a/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.169.13 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:62:64 -mac2: e4:43:4b:b1:62:66 -mac3: e4:43:4b:b1:62:84 -mac4: e4:43:4b:b1:62:85 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-03.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-03.rdu3.fedoraproject.org index c1e96d1363..0c7cd57541 100644 --- a/inventory/host_vars/bvmhost-x86-03.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-03.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:61:52 mac1: c4:cb:e1:e1:61:53 diff --git a/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org deleted file mode 100644 index f8d2ad4730..0000000000 --- a/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,40 +0,0 @@ ---- -br0_ipv4: 10.3.167.13 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -has_ipv4: yes -mac1: 24:6e:96:b1:c7:f4 -mac2: 24:6e:96:b1:c7:f5 -mac3: 24:6e:96:b1:c7:f0 -mac4: 24:6e:96:b1:c7:f2 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-03.stg.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-03.stg.rdu3.fedoraproject.org index 579ea846fe..ce7d34cce0 100644 --- a/inventory/host_vars/bvmhost-x86-03.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-03.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:60:0c mac1: c4:cb:e1:e1:60:0d diff --git a/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org deleted file mode 100644 index 25e9694583..0000000000 --- a/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.169.14 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:03:30 -mac2: e4:43:4b:b1:03:32 -mac3: e4:43:4b:b1:03:50 -mac4: e4:43:4b:b1:03:51 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-04.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-04.rdu3.fedoraproject.org index 87d98de473..388896378b 100644 --- a/inventory/host_vars/bvmhost-x86-04.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-04.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:60:0a mac1: c4:cb:e1:e1:60:0b diff --git a/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org deleted file mode 100644 index 5d0729d65b..0000000000 --- a/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.169.15 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:ae:44:ee -mac2: e4:43:4b:ae:44:f0 -mac3: e4:43:4b:ae:45:0e -mac4: e4:43:4b:ae:45:0f -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-05.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-05.rdu3.fedoraproject.org index 30dce15b73..bc66d41449 100644 --- a/inventory/host_vars/bvmhost-x86-05.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-05.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:60:fc mac1: c4:cb:e1:e1:60:fd diff --git a/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org deleted file mode 100644 index 7469af02e4..0000000000 --- a/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.167.17 -br0_ipv4_gw: 10.3.167.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: E4:43:4B:F7:AC:CC -mac2: E4:43:4B:F7:AC:CE -mac3: E4:43:4B:F7:AC:EC -mac4: E4:43:4B:F7:AC:ED -mgmt_ipv4: 10.3.160.157 -mgmt_mac: "2c:ea:7f:f3:58:4e" -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org deleted file mode 100644 index 34aac0271f..0000000000 --- a/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.169.16 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:ac:e1:54 -mac2: e4:43:4b:ac:e1:56 -mac3: e4:43:4b:ac:e1:74 -mac4: e4:43:4b:ac:e1:75 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-06.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-06.rdu3.fedoraproject.org index 8a017f134f..66796722fb 100644 --- a/inventory/host_vars/bvmhost-x86-06.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-06.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:59:e6 mac1: c4:cb:e1:e1:59:e7 diff --git a/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org deleted file mode 100644 index a6a23dc4ac..0000000000 --- a/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_ipv4: 10.3.169.17 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:2b:52 -mac2: e4:43:4b:b1:2b:54 -mac3: e4:43:4b:b1:2b:72 -mac4: e4:43:4b:b1:2b:73 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org deleted file mode 100644 index 7e921186f2..0000000000 --- a/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org +++ /dev/null @@ -1,46 +0,0 @@ ---- -br0_ipv4: 10.3.169.18 -br0_ipv4_gw: 10.3.169.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac2 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:24:19:96 -mac2: e4:43:4b:24:19:76 -mac3: e4:43:4b:24:19:97 -mac4: e4:43:4b:24:19:78 -nbde_client_bindings: - - device: /dev/md126 - encryption_password: "{{ nbde_password }}" - password_temporary: no - threshold: 1 - servers: - - http://tang01.iad2.fedoraproject.org - - http://tang02.iad2.fedoraproject.org -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-riscv01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-riscv01.iad2.fedoraproject.org deleted file mode 100644 index 6b4094e9ca..0000000000 --- a/inventory/host_vars/bvmhost-x86-riscv01.iad2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -br0_ipv4: 10.3.172.11 -br0_ipv4_gw: 10.3.172.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac2 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 20:3a:43:03:d0:4c -mac2: 20:3a:43:03:d0:4d -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/bvmhost-x86-riscv01.rdu3.fedoraproject.org b/inventory/host_vars/bvmhost-x86-riscv01.rdu3.fedoraproject.org index 0bf84c58be..124f1dee2c 100644 --- a/inventory/host_vars/bvmhost-x86-riscv01.rdu3.fedoraproject.org +++ b/inventory/host_vars/bvmhost-x86-riscv01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:5f:c4 mac1: c4:cb:e1:e1:5f:c5 diff --git a/inventory/host_vars/centos-ipa-client01.stg.iad2.fedoraproject.org b/inventory/host_vars/centos-ipa-client01.stg.iad2.fedoraproject.org deleted file mode 100644 index 33e6eb3aea..0000000000 --- a/inventory/host_vars/centos-ipa-client01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.42 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -nagios_Can_Connect: false -nagios_Check_Services: - mail: false - nrpe: false - ping: false - sshd: false - swap: false -vmhost: vmhost-x86-11.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/centos-ipa-client02.stg.iad2.fedoraproject.org b/inventory/host_vars/centos-ipa-client02.stg.iad2.fedoraproject.org deleted file mode 100644 index b50694529c..0000000000 --- a/inventory/host_vars/centos-ipa-client02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.43 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -nagios_Can_Connect: false -nagios_Check_Services: - mail: false - nrpe: false - ping: false - sshd: false - swap: false -vmhost: vmhost-x86-12.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/centos-ipa-client03.stg.iad2.fedoraproject.org b/inventory/host_vars/centos-ipa-client03.stg.iad2.fedoraproject.org deleted file mode 100644 index a7aab9a507..0000000000 --- a/inventory/host_vars/centos-ipa-client03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.81 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -nagios_Can_Connect: false -nagios_Check_Services: - mail: false - nrpe: false - ping: false - sshd: false - swap: false -vmhost: vmhost-x86-11.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/centos-ipa-client04.stg.iad2.fedoraproject.org b/inventory/host_vars/centos-ipa-client04.stg.iad2.fedoraproject.org deleted file mode 100644 index 64ca207a55..0000000000 --- a/inventory/host_vars/centos-ipa-client04.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.82 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -nagios_Can_Connect: false -nagios_Check_Services: - mail: false - nrpe: false - ping: false - sshd: false - swap: false -vmhost: vmhost-x86-11.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/certgetter01.iad2.fedoraproject.org b/inventory/host_vars/certgetter01.iad2.fedoraproject.org deleted file mode 100644 index 81cda7a0a4..0000000000 --- a/inventory/host_vars/certgetter01.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.47 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -mem_size: 4096 -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/compose-branched01.iad2.fedoraproject.org b/inventory/host_vars/compose-branched01.iad2.fedoraproject.org deleted file mode 100644 index 8628a5a0ee..0000000000 --- a/inventory/host_vars/compose-branched01.iad2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.121 -freezes: true -koji_hub_nfs: "fedora_koji" -kojihub_scheme: https -kojihub_url: koji.fedoraproject.org/kojihub -kojipkgs_url: kojipkgs.fedoraproject.org -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -virt_install_command: "{{ virt_install_command_one_nic_unsafe }}" -vmhost: bvmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/compose-eln01.iad2.fedoraproject.org b/inventory/host_vars/compose-eln01.iad2.fedoraproject.org deleted file mode 100644 index f9be347dea..0000000000 --- a/inventory/host_vars/compose-eln01.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.125 -# eln is never frozen, the compose box should not be so we can make needed changes -freezes: false -koji_hub_nfs: "fedora_koji" -koji_instance: "primary" -kojihub_scheme: https -kojihub_url: koji.fedoraproject.org/kojihub -kojipkgs_url: kojipkgs.fedoraproject.org -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -virt_install_command: "{{ virt_install_command_one_nic_unsafe }}" -vmhost: bvmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/compose-iot01.iad2.fedoraproject.org b/inventory/host_vars/compose-iot01.iad2.fedoraproject.org deleted file mode 100644 index f1303923b1..0000000000 --- a/inventory/host_vars/compose-iot01.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.122 -# This VM is the compose host for IoT Edition -freezes: false -koji_hub_nfs: "fedora_koji" -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/38/Everything/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -main_bridge: br0 -mem_size: 32768 -sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: bvmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org b/inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org deleted file mode 100644 index 682d82b2d7..0000000000 --- a/inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.123 -# rawhide is never frozen, the compose box should not be so we can make needed changes -freezes: false -koji_hub_nfs: "fedora_koji" -kojihub_scheme: https -kojihub_url: koji.fedoraproject.org/kojihub -kojipkgs_url: kojipkgs.fedoraproject.org -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -virt_install_command: "{{ virt_install_command_one_nic_unsafe }}" -vmhost: bvmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/compose-x86-01.iad2.fedoraproject.org b/inventory/host_vars/compose-x86-01.iad2.fedoraproject.org deleted file mode 100644 index fd4cdcf338..0000000000 --- a/inventory/host_vars/compose-x86-01.iad2.fedoraproject.org +++ /dev/null @@ -1,17 +0,0 @@ -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.124 -koji_hub_nfs: "fedora_koji" -kojihub_scheme: https -kojihub_url: koji.fedoraproject.org/kojihub -kojipkgs_url: kojipkgs.fedoraproject.org -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -# -# These are 64bit -# -libdir: /usr/lib64 -lvm_size: 250000 -virt_install_command: "{{ virt_install_command_one_nic_unsafe }}" -vmhost: bvmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/compose-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/compose-x86-01.stg.iad2.fedoraproject.org deleted file mode 100644 index c4d54a8287..0000000000 --- a/inventory/host_vars/compose-x86-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ -datacenter: staging -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.33 -koji_hub_nfs: "fedora_koji" -kojihub_scheme: http -kojihub_url: koji.stg.fedoraproject.org/kojihub -kojipkgs_url: kojipkgs.fedoraproject.org -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/data-reports01.iad2.fedoraproject.org b/inventory/host_vars/data-reports01.iad2.fedoraproject.org deleted file mode 100644 index decf5d8616..0000000000 --- a/inventory/host_vars/data-reports01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.113 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/37/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-datanommer01.stg.iad2.fedoraproject.org b/inventory/host_vars/db-datanommer01.stg.iad2.fedoraproject.org deleted file mode 100644 index 4274421eb4..0000000000 --- a/inventory/host_vars/db-datanommer01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,26 +0,0 @@ ---- -# This is a generic list, monitored by collectd -databases: - - datanommer -datacenter: iad2 -effective_cache_size: "12GB" -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.59 -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 1000000 -max_mem_size: 98304 -mem_size: 65536 -num_cpus: 8 -sar_huge: true -sar_output_file: datagrepper.csv -# GDPR SAR variables - datanommer/datagrepper -sar_script: /usr/local/bin/datagrepper_sar.py -sar_script_user: root -shared_buffers: "4GB" -tcp_ports: [5432, 443] -vmhost: vmhost-x86-01.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org b/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org deleted file mode 100644 index cdc9fcfee7..0000000000 --- a/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -# This is a generic list, monitored by collectd -databases: - - datanommer -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list, to be made publicly available -dbs_to_backup: - - datanommer2 -effective_cache_size: "12GB" -eth0_ipv4: "{{eth0_ip}}" -eth0_ipv4_gw: "10.3.163.254" -eth0_ipv4_ip: 10.3.163.111 -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 2000g -max_cpu: "{{ num_cpus * 2 }}" -max_mem_size: "{{ mem_size * 2 }}" -max_parallel_workers: 6 -max_parallel_workers_per_gather: 4 -max_worker_processes: 8 -mem_size: 32768 -nagios_Check_Services: - swap: false -num_cpus: 16 -sar_huge: true -sar_output_file: datagrepper.csv -# GDPR SAR variables - datanommer/datagrepper -sar_script: /usr/local/bin/datagrepper_sar.py -sar_script_user: root -shared_buffers: "4GB" -tcp_ports: [5432, 443] -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-datanommer02.rdu3.fedoraproject.org b/inventory/host_vars/db-datanommer02.rdu3.fedoraproject.org index 9e1509961c..d236314e3d 100644 --- a/inventory/host_vars/db-datanommer02.rdu3.fedoraproject.org +++ b/inventory/host_vars/db-datanommer02.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end db_backup_dir: ['/backups'] # This is a more strict list, to be made publicly available diff --git a/inventory/host_vars/db-fas01.iad2.fedoraproject.org b/inventory/host_vars/db-fas01.iad2.fedoraproject.org deleted file mode 100644 index 56b71d8c94..0000000000 --- a/inventory/host_vars/db-fas01.iad2.fedoraproject.org +++ /dev/null @@ -1,52 +0,0 @@ ---- -# -# Only allow postgresql access from the frontend nodes and hosted. -# -custom_rules: [ - # Openshift nodes (egress policy will block connection from non-authorized projects) - '-A INPUT -p tcp -m tcp -s 10.3.163.69 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.70 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.71 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.72 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.73 --dport 5432 -j ACCEPT', - # noc01 needs to connect to check the db - '-A INPUT -p tcp -m tcp -s 10.3.163.10 --dport 5432 -j ACCEPT', - # Ipsilon VMs - '-A INPUT -p tcp -m tcp -s 10.3.163.105 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.106 --dport 5432 -j ACCEPT'] -nft_custom_rules: - # Openshift nodes (egress policy will block connection from non-authorized projects) - - 'add rule ip filter INPUT ip saddr 10.3.163.69 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.70 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.71 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.72 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.73 tcp dport 5432 counter accept' - # noc01 needs to connect to check the db - - 'add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5432 counter accept' - # Ipsilon VMs - - 'add rule ip filter INPUT ip saddr 10.3.163.105 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.106 tcp dport 5432 counter accept' -# This is a generic list, monitored by collectd -databases: - - fas2 - - ipsilon -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list, to be made publicly available -dbs_to_backup: - - fas2 - - ipsilon -effective_cache_size: "6GB" -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.42 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 100000 -max_stack_depth: "4MB" -mem_size: 16384 -nrpe_procs_crit: 800 -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -num_cpus: 8 -shared_buffers: "2GB" -temp_buffers: "8MB" -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-fas01.rdu3.fedoraproject.org b/inventory/host_vars/db-fas01.rdu3.fedoraproject.org index ff86aa7eac..f0f08381df 100644 --- a/inventory/host_vars/db-fas01.rdu3.fedoraproject.org +++ b/inventory/host_vars/db-fas01.rdu3.fedoraproject.org @@ -24,7 +24,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end db_backup_dir: ['/backups'] # This is a more strict list, to be made publicly available diff --git a/inventory/host_vars/db-fas01.stg.iad2.fedoraproject.org b/inventory/host_vars/db-fas01.stg.iad2.fedoraproject.org deleted file mode 100644 index fb4a35e62e..0000000000 --- a/inventory/host_vars/db-fas01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,42 +0,0 @@ ---- -# -# Only allow postgresql access from the frontend node and ipsilon01.stg and -# fas3-01.stg and openshift -# -custom_rules: - # - '-A INPUT -p tcp -m tcp -s 10.5.128.129 --dport 5432 -j ACCEPT' - # - '-A INPUT -p tcp -m tcp -s 10.5.128.137 --dport 5432 -j ACCEPT' - # - '-A INPUT -p tcp -m tcp -s 10.5.128.82 --dport 5432 -j ACCEPT' - # - '-A INPUT -p tcp -m tcp -s 10.5.128.104 --dport 5432 -j ACCEPT' - # - '-A INPUT -p tcp -m tcp -s 10.5.128.105 --dport 5432 -j ACCEPT' - # - '-A INPUT -p tcp -m tcp -s 10.5.128.106 --dport 5432 -j ACCEPT' - # - '-A INPUT -p tcp -m tcp -s 10.5.128.107 --dport 5432 -j ACCEPT' - # TODO: lock it down more - - '-A INPUT -p tcp -m tcp -s 10.3.166.0/24 --dport 5432 -j ACCEPT' -nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.166.0/24 tcp dport 5432 counter accept' -# This is a generic list, monitored by collectd -databases: - - fas2 -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list, to be made publicly available -dbs_to_backup: - - fas2 -effective_cache_size: "3GB" -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.34 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 30000 -mem_size: 4096 -nrpe_procs_crit: 500 -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 400 -num_cpus: 2 -shared_buffers: "1GB" -vmhost: vmhost-x86-01.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-koji01.iad2.fedoraproject.org b/inventory/host_vars/db-koji01.iad2.fedoraproject.org deleted file mode 100644 index df0956741c..0000000000 --- a/inventory/host_vars/db-koji01.iad2.fedoraproject.org +++ /dev/null @@ -1,49 +0,0 @@ ---- -# -# Only allow postgresql access from the frontend node. -# -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.169.104 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.169.105 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.169.10 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.3.163.10 --dport 5432 -j ACCEPT'] -nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 10.3.169.104 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.169.105 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.169.10 tcp dport 5432 counter accept' - - 'add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5432 counter accept' -# This is a generic list, monitored by collectd -databases: - - koji -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list, to be made publicly available -dbs_to_backup: - - koji -effective_cache_size: "100GB" -effective_io_concurrency: 20 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.103 -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 1750000 -max_cpu: 96 -max_mem_size: 327680 -max_parallel_maintenance_workers: 4 -max_parallel_workers: 40 -max_parallel_workers_per_gather: 10 -max_stack_depth: "6MB" -max_worker_processes: 60 -mem_size: 262140 -nagios_Check_Services: - swap: false -nrpe_procs_crit: 700 -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -num_cpus: 64 -shared_buffers: "64GB" -swap: false -temp_buffers: "192MB" -vmhost: bvmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-koji01.rdu3.fedoraproject.org b/inventory/host_vars/db-koji01.rdu3.fedoraproject.org index 01cfb440a1..8b3fa3900a 100644 --- a/inventory/host_vars/db-koji01.rdu3.fedoraproject.org +++ b/inventory/host_vars/db-koji01.rdu3.fedoraproject.org @@ -16,7 +16,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end db_backup_dir: ['/backups'] # This is a more strict list, to be made publicly available diff --git a/inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org b/inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org deleted file mode 100644 index ce0b5904f4..0000000000 --- a/inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,30 +0,0 @@ ---- -# -# Only allow postgresql access from the frontend node. -# -custom_rules: ['-A INPUT -p tcp -m tcp -s 10.3.167.64 --dport 5432 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT ip saddr 10.3.167.64 tcp dport 5432 counter accept'] -# This is a generic list, monitored by collectd -databases: - - koji -datacenter: iad2 -effective_cache_size: "12GB" -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.65 -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 2000000 -max_mem_size: "{{ mem_size }}" -mem_size: 65536 -nrpe_procs_crit: 700 -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -num_cpus: 16 -shared_buffers: "4GB" -vmhost: bvmhost-x86-02.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-openqa01.iad2.fedoraproject.org b/inventory/host_vars/db-openqa01.iad2.fedoraproject.org deleted file mode 100644 index f1c095ab64..0000000000 --- a/inventory/host_vars/db-openqa01.iad2.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- -# This is a generic list, monitored by collectd -databases: - - postgres - - openqa -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list, to be made publicly available -dbs_to_backup: - - postgres - # these names are also stored as host vars 'openqa_dbname', - # make sure to keep in sync - - openqa - - openqa-stg -effective_cache_size: "6GB" -eth0_ipv4_gw: 10.3.174.254 -eth0_ipv4_ip: 10.3.174.51 -host_backup_targets: ['/backups'] -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 300000 -mem_size: 16384 -num_cpus: 10 -shared_buffers: "2GB" -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -tcp_ports: [5432, 443, 3306] -vmhost: qvmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db01.iad2.fedoraproject.org b/inventory/host_vars/db01.iad2.fedoraproject.org deleted file mode 100644 index 9407754b08..0000000000 --- a/inventory/host_vars/db01.iad2.fedoraproject.org +++ /dev/null @@ -1,77 +0,0 @@ ---- -# -# We should narrow this down at some point -# -custom_rules: ['-A INPUT -p tcp -m tcp --dport 5432 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT tcp dport 5432 counter accept'] -# This is a generic list, monitored by collectd -databases: - - anitya - - blockerbugs - - bodhi2 - - elections - - fedocal - - hyperkitty - - kerneltest - - koschei - - mailman - - mirrormanager2 - - notifications - - pagure - - resultsdb - - tahrir - - testdays - - testdays_resultsdb - - transtats - - waiverdb - - webhook2fedmsg - - zezere -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list of databases to backup every day -dbs_to_backup: - - anitya - - blockerbugs - - bodhi2 - - elections - - fedocal - - hyperkitty - - kerneltest - - koschei - - mailman - - mirrormanager2 - - notifications - - pagure - - resultsdb - - tahrir - - testdays - - testdays_resultsdb - - transtats - - waiverdb - - webhook2fedmsg - - zezere -# Should be 0.80 of memory -effective_cache_size: "50GB" -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.41 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 1500000 -max_cpu: "{{ num_cpus }}" -max_mem_size: "{{ mem_size * 2 }}" -max_stack_depth: "6MB" -max_worker_processes: 12 -mem_size: 65536 -nagios_Check_Services: - swap: false -nrpe_procs_crit: 900 -# -# db01 handles lots of apps, could have many procs if they are busy. -# -nrpe_procs_warn: 800 -num_cpus: 48 -# Should be 0.25 of memory -shared_buffers: "24GB" -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db01.rdu3.fedoraproject.org b/inventory/host_vars/db01.rdu3.fedoraproject.org index 2a1d474bfc..e4c6b175d9 100644 --- a/inventory/host_vars/db01.rdu3.fedoraproject.org +++ b/inventory/host_vars/db01.rdu3.fedoraproject.org @@ -31,7 +31,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end db_backup_dir: ['/backups'] # This is a more strict list of databases to backup every day diff --git a/inventory/host_vars/db01.stg.iad2.fedoraproject.org b/inventory/host_vars/db01.stg.iad2.fedoraproject.org deleted file mode 100644 index 305dc448db..0000000000 --- a/inventory/host_vars/db01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -# -# We should narrow this down at some point -# -custom_rules: ['-A INPUT -p tcp -m tcp --dport 5432 -j ACCEPT'] -nft_custom_rules: ['add rule ip filter INPUT tcp dport 5432 counter accept'] -# This is a generic list, monitored by collectd -databases: - - askfedora - - blockerbugs - - bodhi - - elections - - fedocal - - kerneltest - - mailman - - mirrormanager - - notifications - - tahrir -datacenter: iad2 -effective_cache_size: "12GB" -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.32 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 500000 -mem_size: 16384 -nrpe_procs_crit: 900 -# -# db01 handles lots of apps, could have many procs if they are busy. -# -nrpe_procs_warn: 800 -num_cpus: 4 -shared_buffers: "4GB" -vmhost: vmhost-x86-09.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db03.iad2.fedoraproject.org b/inventory/host_vars/db03.iad2.fedoraproject.org deleted file mode 100644 index 701c8bfc26..0000000000 --- a/inventory/host_vars/db03.iad2.fedoraproject.org +++ /dev/null @@ -1,26 +0,0 @@ ---- -# This is a generic list, monitored by collectd -databases: - - mysql - - fpo-mediawiki -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list of db to backup to /backups -dbs_to_backup: - - fpo-mediawiki -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.44 -extra_enablerepos: '' -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 500000 -mariadb_root_password: "{{ db03_mysql_root_password }}" -mem_size: 16384 -num_cpus: 8 -shared_buffers: "4GB" -tcp_ports: [5432, 443, 3306] -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db03.rdu3.fedoraproject.org b/inventory/host_vars/db03.rdu3.fedoraproject.org index c7200e688e..585ed957fa 100644 --- a/inventory/host_vars/db03.rdu3.fedoraproject.org +++ b/inventory/host_vars/db03.rdu3.fedoraproject.org @@ -9,7 +9,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end db_backup_dir: ['/backups'] # This is a more strict list of db to backup to /backups diff --git a/inventory/host_vars/db03.stg.iad2.fedoraproject.org b/inventory/host_vars/db03.stg.iad2.fedoraproject.org deleted file mode 100644 index 620760f4fa..0000000000 --- a/inventory/host_vars/db03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,24 +0,0 @@ ---- -# This is a generic list, monitored by collectd -databases: - - postgres -datacenter: iad2 -db_backup_dir: ['/backups'] -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.35 -extra_enablerepos: '' -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 500000 -# This is a more strict list, to be made publicly available -#dbs_to_backup: -mariadb_root_password: "{{ db03_stg_mysql_root_password }}" -mem_size: 16384 -num_cpus: 4 -shared_buffers: "4GB" -tcp_ports: [5432, 443, 3306] -vmhost: vmhost-x86-01.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/debuginfod01.iad2.fedoraproject.org b/inventory/host_vars/debuginfod01.iad2.fedoraproject.org deleted file mode 100644 index ae46af24f8..0000000000 --- a/inventory/host_vars/debuginfod01.iad2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.109 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -sar_script_user: root -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests -dnf_automatic_type: default diff --git a/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org b/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org deleted file mode 100644 index 49dcd5e2ab..0000000000 --- a/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.62 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-08.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -dnf_automatic_type: default diff --git a/inventory/host_vars/dl01.iad2.fedoraproject.org b/inventory/host_vars/dl01.iad2.fedoraproject.org deleted file mode 100644 index e5e163448e..0000000000 --- a/inventory/host_vars/dl01.iad2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.49 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 20000 -max_mem_size: 20480 -mem_size: 16384 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -public_hostname: dl-iad01.fedoraproject.org -tcp_ports: [80, 443, 873] -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/dl02.iad2.fedoraproject.org b/inventory/host_vars/dl02.iad2.fedoraproject.org deleted file mode 100644 index 9cc1f327b5..0000000000 --- a/inventory/host_vars/dl02.iad2.fedoraproject.org +++ /dev/null @@ -1,19 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.50 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 20000 -main_bridge: br0 -max_mem_size: 20480 -mem_size: 16384 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -public_hostname: dl-iad01.fedoraproject.org -tcp_ports: [80, 443, 873] -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/dl03.iad2.fedoraproject.org b/inventory/host_vars/dl03.iad2.fedoraproject.org deleted file mode 100644 index fc8e647225..0000000000 --- a/inventory/host_vars/dl03.iad2.fedoraproject.org +++ /dev/null @@ -1,19 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.51 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 20000 -main_bridge: br0 -max_mem_size: 20480 -mem_size: 16384 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -public_hostname: dl-iad01.fedoraproject.org -tcp_ports: [80, 443, 873] -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/dl04.iad2.fedoraproject.org b/inventory/host_vars/dl04.iad2.fedoraproject.org deleted file mode 100644 index 70195402a3..0000000000 --- a/inventory/host_vars/dl04.iad2.fedoraproject.org +++ /dev/null @@ -1,19 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.85 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 20000 -main_bridge: br0 -max_mem_size: 20480 -mem_size: 16384 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -public_hostname: dl-iad01.fedoraproject.org -tcp_ports: [80, 443, 873] -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/dl05.iad2.fedoraproject.org b/inventory/host_vars/dl05.iad2.fedoraproject.org deleted file mode 100644 index eb7e51a6e8..0000000000 --- a/inventory/host_vars/dl05.iad2.fedoraproject.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.84 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 20000 -main_bridge: br0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -public_hostname: dl-iad01.fedoraproject.org -tcp_ports: [80, 443, 873] -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/flatpak-cache01.iad2.fedoraproject.org b/inventory/host_vars/flatpak-cache01.iad2.fedoraproject.org deleted file mode 100644 index 5216bddb57..0000000000 --- a/inventory/host_vars/flatpak-cache01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.174.70 -eth0_ipv4_gw: 10.3.174.254 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: qvmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests \ No newline at end of file diff --git a/inventory/host_vars/github2fedmsg01.iad2.fedoraproject.org b/inventory/host_vars/github2fedmsg01.iad2.fedoraproject.org deleted file mode 100644 index 91c4e7d61c..0000000000 --- a/inventory/host_vars/github2fedmsg01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.53 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-iad2 -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipa01.iad2.fedoraproject.org b/inventory/host_vars/ipa01.iad2.fedoraproject.org deleted file mode 100644 index dbd6f4aa1f..0000000000 --- a/inventory/host_vars/ipa01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.54 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipa01.stg.iad2.fedoraproject.org b/inventory/host_vars/ipa01.stg.iad2.fedoraproject.org deleted file mode 100644 index d63b8f7af6..0000000000 --- a/inventory/host_vars/ipa01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.21 -## REMEMBER ONLY SET THIS TO TRUE WHEN WIPING SYSTEM TO MINIMUM -ipa_initial: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-11.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipa02.iad2.fedoraproject.org b/inventory/host_vars/ipa02.iad2.fedoraproject.org deleted file mode 100644 index 5ce367ec13..0000000000 --- a/inventory/host_vars/ipa02.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.55 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipa02.stg.iad2.fedoraproject.org b/inventory/host_vars/ipa02.stg.iad2.fedoraproject.org deleted file mode 100644 index 5b678b0c89..0000000000 --- a/inventory/host_vars/ipa02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.63 -## REMEMBER ONLY SET THIS TO TRUE WHEN WIPING SYSTEM TO MINIMUM -ipa_initial: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-02.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests - -# see group_vars/zabbix_stg for details -zabbix_macros: - VFS.DEV.READ.AWAIT.WARN: 30 - VFS.DEV.WRITE.AWAIT.WARN: 30 diff --git a/inventory/host_vars/ipa03.iad2.fedoraproject.org b/inventory/host_vars/ipa03.iad2.fedoraproject.org deleted file mode 100644 index c5beb6b8aa..0000000000 --- a/inventory/host_vars/ipa03.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.104 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipa03.stg.iad2.fedoraproject.org b/inventory/host_vars/ipa03.stg.iad2.fedoraproject.org deleted file mode 100644 index ad4e0ac293..0000000000 --- a/inventory/host_vars/ipa03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.68 -## REMEMBER ONLY SET THIS TO TRUE WHEN WIPING SYSTEM TO MINIMUM -ipa_initial: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-02.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests - -# see group_vars/zabbix_stg for details -zabbix_macros: - VFS.DEV.READ.AWAIT.WARN: 30 - VFS.DEV.WRITE.AWAIT.WARN: 30 diff --git a/inventory/host_vars/ipsilon01.iad2.fedoraproject.org b/inventory/host_vars/ipsilon01.iad2.fedoraproject.org deleted file mode 100644 index 07217d66e4..0000000000 --- a/inventory/host_vars/ipsilon01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.105 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org b/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org deleted file mode 100644 index b262291b0c..0000000000 --- a/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.30 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-11.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ipsilon02.iad2.fedoraproject.org b/inventory/host_vars/ipsilon02.iad2.fedoraproject.org deleted file mode 100644 index 632e7fae2c..0000000000 --- a/inventory/host_vars/ipsilon02.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.106 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/kernel01.iad2.fedoraproject.org b/inventory/host_vars/kernel01.iad2.fedoraproject.org deleted file mode 100644 index c4bac059f5..0000000000 --- a/inventory/host_vars/kernel01.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -dns: 10.3.163.33 -eth0_ip: 10.3.174.129 -gw: 10.3.174.254 -nm: 255.255.255.0 -resolvconf: "resolv.conf/iad2" diff --git a/inventory/host_vars/kernel02.iad2.fedoraproject.org b/inventory/host_vars/kernel02.iad2.fedoraproject.org deleted file mode 100644 index 655277e39c..0000000000 --- a/inventory/host_vars/kernel02.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -datacenter: iad2 -dns: 10.3.163.33 -eth0_ipv4_ip: 10.3.174.130 -eth0_ipv4_gw: 10.3.174.254 -eth0_ipv4_nm: 24 -resolvconf: "resolv.conf/iad2" diff --git a/inventory/host_vars/koji01.iad2.fedoraproject.org b/inventory/host_vars/koji01.iad2.fedoraproject.org deleted file mode 100644 index 72a8ed2fbd..0000000000 --- a/inventory/host_vars/koji01.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.104 -koji_instance: primary -koji_server_url: "https://koji.fedoraproject.org/kojihub" -koji_topurl: "https://kojipkgs.fedoraproject.org/" -koji_weburl: "https://koji.fedoraproject.org/koji" -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: bvmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/koji01.rdu3.fedoraproject.org b/inventory/host_vars/koji01.rdu3.fedoraproject.org index 08d08ee209..e8d23755b2 100644 --- a/inventory/host_vars/koji01.rdu3.fedoraproject.org +++ b/inventory/host_vars/koji01.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.169.254 eth0_ipv4_ip: 10.16.169.104 diff --git a/inventory/host_vars/koji01.stg.iad2.fedoraproject.org b/inventory/host_vars/koji01.stg.iad2.fedoraproject.org deleted file mode 100644 index 8ea341b38e..0000000000 --- a/inventory/host_vars/koji01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.64 -koji_instance: primary -koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" -koji_topurl: "https://kojipkgs.stg.fedoraproject.org/" -koji_weburl: "https://koji.stg.fedoraproject.org/koji" -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 1.5t -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/koji02.iad2.fedoraproject.org b/inventory/host_vars/koji02.iad2.fedoraproject.org deleted file mode 100644 index a0f572b4a5..0000000000 --- a/inventory/host_vars/koji02.iad2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.105 -koji_instance: primary -koji_server_url: "https://koji.fedoraproject.org/kojihub" -koji_topurl: "https://kojipkgs.fedoraproject.org/" -koji_weburl: "https://koji.fedoraproject.org/koji" -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: bvmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/koji02.rdu3.fedoraproject.org b/inventory/host_vars/koji02.rdu3.fedoraproject.org index 8a4450ec68..70e55db953 100644 --- a/inventory/host_vars/koji02.rdu3.fedoraproject.org +++ b/inventory/host_vars/koji02.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.169.254 eth0_ipv4_ip: 10.16.169.105 diff --git a/inventory/host_vars/kojipkgs01.iad2.fedoraproject.org b/inventory/host_vars/kojipkgs01.iad2.fedoraproject.org deleted file mode 100644 index d647cf2feb..0000000000 --- a/inventory/host_vars/kojipkgs01.iad2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.106 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: bvmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/kojipkgs02.iad2.fedoraproject.org b/inventory/host_vars/kojipkgs02.iad2.fedoraproject.org deleted file mode 100644 index 1db6b1751e..0000000000 --- a/inventory/host_vars/kojipkgs02.iad2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.107 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: bvmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/log01.iad2.fedoraproject.org b/inventory/host_vars/log01.iad2.fedoraproject.org deleted file mode 100644 index d9fce8e2b0..0000000000 --- a/inventory/host_vars/log01.iad2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.39 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-ext -lvm_size: 1048576 -mem_size: 16384 -#host_backup_targets: ['/var/log'] -nagios_Check_Services: - swap: false -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 16 -tcp_ports: [80, 443, 514, 6514] -udp_ports: [514, 25826] -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/mailman01.iad2.fedoraproject.org b/inventory/host_vars/mailman01.iad2.fedoraproject.org deleted file mode 100644 index dd8b6b44de..0000000000 --- a/inventory/host_vars/mailman01.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.57 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 1500000 -sar_output_file: mailinglists.json -# GDPR SAR variables -sar_script: /srv/webui/bin/mailman-sar.py -sar_script_user: mailman -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests -num_cpus: 8 diff --git a/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org b/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org deleted file mode 100644 index d0878cf2f5..0000000000 --- a/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.40 -external: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-09.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -sar_output_file: mailinglists.json -# GDPR SAR variables -sar_script: /srv/webui/bin/mailman-sar.py -sar_script_user: mailman diff --git a/inventory/host_vars/mailman01.stg.rdu3.fedoraproject.org b/inventory/host_vars/mailman01.stg.rdu3.fedoraproject.org index 68ce7e6452..6044f5af34 100644 --- a/inventory/host_vars/mailman01.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/mailman01.stg.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ datacenter: rdu3 dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" -dns_search2: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" # end eth0_ipv4_gw: 10.16.166.254 diff --git a/inventory/host_vars/memcached02.iad2.fedoraproject.org b/inventory/host_vars/memcached02.iad2.fedoraproject.org deleted file mode 100644 index 73573360e2..0000000000 --- a/inventory/host_vars/memcached02.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.130 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/memcached02.stg.iad2.fedoraproject.org b/inventory/host_vars/memcached02.stg.iad2.fedoraproject.org deleted file mode 100644 index 23f10011af..0000000000 --- a/inventory/host_vars/memcached02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.77 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/noc01.iad2.fedoraproject.org b/inventory/host_vars/noc01.iad2.fedoraproject.org deleted file mode 100644 index 93a7b5194e..0000000000 --- a/inventory/host_vars/noc01.iad2.fedoraproject.org +++ /dev/null @@ -1,27 +0,0 @@ ---- -custom_rules: [ - '-A INPUT -p tcp -m tcp -s 192.168.1.20 --dport 5666 -j ACCEPT', - # needed to allow rsync from log01 - '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' - ] -nft_custom_rules: - - 'add rule ip filter INPUT ip saddr 192.168.1.20 tcp dport 5666 counter accept' - # needed to allow rsync from log01 - - 'add rule ip filter INPUT ip saddr 10.3.163.39 tcp dport 873 counter accept' - - 'add rule ip filter INPUT ip saddr 192.168.1.59 tcp dport 873 counter accept' -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.10 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 8192 -nagios_location: 'iad2_internal' -nagios_srcdir: 'nagios' -num_cpus: 4 -tcp_ports: ['22', '80', '443', '67', '68'] -udp_ports: ['67', '68', '69'] -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ns01.iad2.fedoraproject.org b/inventory/host_vars/ns01.iad2.fedoraproject.org deleted file mode 100644 index 11f2829a68..0000000000 --- a/inventory/host_vars/ns01.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.33 -# -# This host is externally reachable -# -external: true -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ns01.rdu3.fedoraproject.org b/inventory/host_vars/ns01.rdu3.fedoraproject.org index 1d469f4a4a..6fd472809e 100644 --- a/inventory/host_vars/ns01.rdu3.fedoraproject.org +++ b/inventory/host_vars/ns01.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.33 # diff --git a/inventory/host_vars/ns02.iad2.fedoraproject.org b/inventory/host_vars/ns02.iad2.fedoraproject.org deleted file mode 100644 index 0d399c5448..0000000000 --- a/inventory/host_vars/ns02.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.34 -# -# This host is externally reachable -# -external: true -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ns02.rdu3.fedoraproject.org b/inventory/host_vars/ns02.rdu3.fedoraproject.org index 0f2040888e..13b01aba9f 100644 --- a/inventory/host_vars/ns02.rdu3.fedoraproject.org +++ b/inventory/host_vars/ns02.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.34 # diff --git a/inventory/host_vars/oci-candidate-registry01.iad2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.iad2.fedoraproject.org deleted file mode 100644 index fae8211a60..0000000000 --- a/inventory/host_vars/oci-candidate-registry01.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.102 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 50g -max_mem_size: 16384 -mem_size: 16384 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 4 -vmhost: bvmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org deleted file mode 100644 index 2cf1972518..0000000000 --- a/inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.34 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 120g -max_mem_size: 16384 -mem_size: 8192 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 4 -vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/oci-registry01.iad2.fedoraproject.org b/inventory/host_vars/oci-registry01.iad2.fedoraproject.org deleted file mode 100644 index fda6d6f7da..0000000000 --- a/inventory/host_vars/oci-registry01.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.119 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 120g -max_mem_size: 16384 -mem_size: 16384 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 4 -vmhost: bvmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org b/inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org deleted file mode 100644 index 88bcb9328b..0000000000 --- a/inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.35 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 120g -max_mem_size: 16384 -mem_size: 8192 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 4 -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/oci-registry02.iad2.fedoraproject.org b/inventory/host_vars/oci-registry02.iad2.fedoraproject.org deleted file mode 100644 index e563327d0a..0000000000 --- a/inventory/host_vars/oci-registry02.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.127 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 120g -max_mem_size: 16384 -mem_size: 16384 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 4 -vmhost: bvmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/ocp01.ocp.iad2.fedoraproject.org b/inventory/host_vars/ocp01.ocp.iad2.fedoraproject.org deleted file mode 100644 index 39031f30cb..0000000000 --- a/inventory/host_vars/ocp01.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,47 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.120 -eth0_ipv4_gw: 10.3.163.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/controlplane.ign" -rhcos_install_img_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 61d3594e80..0000000000 --- a/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.115 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/ocp02.ocp.iad2.fedoraproject.org b/inventory/host_vars/ocp02.ocp.iad2.fedoraproject.org deleted file mode 100644 index b3fce22cde..0000000000 --- a/inventory/host_vars/ocp02.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,47 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.121 -eth0_ipv4_gw: 10.3.163.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/controlplane.ign" -rhcos_install_img_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 85aa73a633..0000000000 --- a/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.116 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-06.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/ocp03.ocp.iad2.fedoraproject.org b/inventory/host_vars/ocp03.ocp.iad2.fedoraproject.org deleted file mode 100644 index 7c4ffa9ea9..0000000000 --- a/inventory/host_vars/ocp03.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,47 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.122 -eth0_ipv4_gw: 10.3.163.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/controlplane.ign" -rhcos_install_img_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 0cbeb435cd..0000000000 --- a/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.117 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 24576 -mem_size: 24576 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-07.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org deleted file mode 100644 index 766e84d4c4..0000000000 --- a/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enP2p1s0_mac: "{{ mac1 }}" -enp1s0_ipv4: 10.3.174.61 -enp1s0_ipv4_gw: 10.3.174.254 -enp1s0_ipv4_nm: 24 -enp1s0_mac: "{{ mac2 }}" -enp1s0d1_mac: "{{ mac3 }}" -freezes: false -# enP2p1s0 is disabled/nothing -# enp1s0 is active network -# enp1s0d1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: 68:05:ca:8e:9b:86 -mac2: 50:6b:4b:6a:b6:20 -mac3: 50:6b:4b:6a:b6:21 -network_connections: - - autoconnect: no - mac: "{{ enP2p1s0_mac }}" - name: enP2p1s0 - state: down - type: ethernet - - autoconnect: yes - ip: - address: - - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0_ipv4_gw }}" - mac: "{{ enp1s0_mac }}" - name: enp1s0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0d1_mac }}" - name: enp1s0d1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -openqa_rngd: false -openqa_tap_iface: enp1s0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] -nbde_device: /dev/sda3 diff --git a/inventory/host_vars/openqa-a64-worker01.rdu3.fedoraproject.org b/inventory/host_vars/openqa-a64-worker01.rdu3.fedoraproject.org index ed503dfff8..faff31de2f 100644 --- a/inventory/host_vars/openqa-a64-worker01.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-a64-worker01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: d8:5e:d3:e6:24:90 diff --git a/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org deleted file mode 100644 index 0a773e7529..0000000000 --- a/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enP2p1s0_mac: "{{ mac1 }}" -enp1s0_ipv4: 10.3.174.62 -enp1s0_ipv4_gw: 10.3.174.254 -enp1s0_ipv4_nm: 24 -enp1s0_mac: "{{ mac2 }}" -enp1s0d1_mac: "{{ mac3 }}" -freezes: false -# enP2p1s0 is disabled/nothing -# enp1s0 is active network -# enp1s0d1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: 00:1b:21:e0:6a:72 -mac2: 50:6b:4b:7f:a8:b0 -mac3: 50:6b:4b:7f:a8:b1 -network_connections: - - autoconnect: no - mac: "{{ enP2p1s0_mac }}" - name: enP2p1s0 - state: down - type: ethernet - - autoconnect: yes - ip: - address: - - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0_ipv4_gw }}" - mac: "{{ enp1s0_mac }}" - name: enp1s0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0d1_mac }}" - name: enp1s0d1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -openqa_rngd: false -openqa_tap_iface: enp1s0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] -nbde_device: /dev/sda3 diff --git a/inventory/host_vars/openqa-a64-worker02.rdu3.fedoraproject.org b/inventory/host_vars/openqa-a64-worker02.rdu3.fedoraproject.org index 083b990458..b9817d15cf 100644 --- a/inventory/host_vars/openqa-a64-worker02.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-a64-worker02.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: d8:5e:d3:e6:25:64 diff --git a/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org deleted file mode 100644 index 6f5ef6b6a5..0000000000 --- a/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enP2p1s0_mac: "{{ mac1 }}" -enp1s0_ipv4: 10.3.174.63 -enp1s0_ipv4_gw: 10.3.174.254 -enp1s0_ipv4_nm: 24 -enp1s0_mac: "{{ mac2 }}" -enp1s0d1_mac: "{{ mac3 }}" -freezes: false -# enP2p1s0 is disabled/nothing -# enp1s0 is active network -# enp1s0d1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: 00:1b:21:e0:6e:5b -mac2: 50:6b:4b:7f:98:30 -mac3: 50:6b:4b:7f:98:31 -network_connections: - - autoconnect: no - mac: "{{ enP2p1s0_mac }}" - name: enP2p1s0 - state: down - type: ethernet - - autoconnect: yes - ip: - address: - - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0_ipv4_gw }}" - mac: "{{ enp1s0_mac }}" - name: enp1s0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0d1_mac }}" - name: enp1s0d1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -openqa_rngd: false -openqa_tap_iface: enp1s0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] -nbde_device: /dev/sda3 diff --git a/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org deleted file mode 100644 index d06fb6876f..0000000000 --- a/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org +++ /dev/null @@ -1,74 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1_mac: "{{ mac1 }}" -eno2_mac: "{{ mac2 }}" -enP1p1s0f0np0_mac: "{{ mac3 }}" -enP1p1s0f1np1_mac: "{{ mac4 }}" -enP1p1s0f0np0_ipv4: 10.3.174.64 -enP1p1s0f0np0_ipv4_gw: 10.3.174.254 -enP1p1s0f0np0_ipv4_nm: 24 -freezes: false -# eno1 is disabled/nothing -# eno2 is disabled/nothing -# enP1p1s0f0np0 is active network -# enP1p1s0f1np1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: d8:5e:d3:8b:73:d6 -mac2: d8:5e:d3:8b:73:d7 -mac3: 0c:42:a1:5a:08:b0 -mac4: 0c:42:a1:5a:08:b1 -network_connections: - - autoconnect: no - mac: "{{ eno1_mac }}" - name: eno1 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno2_mac }}" - name: eno2 - state: down - type: ethernet - - autoconnect: yes - ip: - address: - - "{{ enP1p1s0f0np0_ipv4 }}/{{ enP1p1s0f0np0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enP1p1s0f0np0_ipv4_gw }}" - mac: "{{ enP1p1s0f0np0_mac }}" - name: enP1p1s0f0np0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enP1p1s0f1np1_mac }}" - name: enP1p1s0f1np1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -openqa_rngd: false -openqa_tap_iface: enP1p1s0f0np0 -# this is a powerful machine, but storage kinda limits how many workers -# we can safely run at once -openqa_workers: 25 -# also means we need to bump the load average threshold -openqa_critical_threshold: 100 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303', '20313', '20323', '20333', '20343', '20353'] diff --git a/inventory/host_vars/openqa-a64-worker05.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker05.iad2.fedoraproject.org deleted file mode 100644 index 2fe486dab8..0000000000 --- a/inventory/host_vars/openqa-a64-worker05.iad2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enP2p1s0_mac: "{{ mac1 }}" -enp1s0_ipv4: 10.3.174.65 -enp1s0_ipv4_gw: 10.3.174.254 -enp1s0_ipv4_nm: 24 -enp1s0_mac: "{{ mac2 }}" -enp1s0d1_mac: "{{ mac3 }}" -freezes: false -# enP2p1s0 is disabled/nothing -# enp1s0 is active network -# enp1s0d1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: 68:05:ca:8a:f0:29 -mac2: 50:6b:4b:6a:eb:b0 -mac3: 50:6b:4b:6a:eb:b1 -network_connections: - - autoconnect: no - mac: "{{ enP2p1s0_mac }}" - name: enP2p1s0 - state: down - type: ethernet - - autoconnect: yes - ip: - address: - - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0_ipv4_gw }}" - mac: "{{ enp1s0_mac }}" - name: enp1s0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0d1_mac }}" - name: enp1s0d1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -openqa_rngd: false -openqa_tap_iface: enp1s0 -# this is a moderately powerful machine (16c/32t, I think) -openqa_workers: 15 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] -nbde_device: /dev/sda3 diff --git a/inventory/host_vars/openqa-a64-worker06.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker06.iad2.fedoraproject.org deleted file mode 100644 index 460286f9dc..0000000000 --- a/inventory/host_vars/openqa-a64-worker06.iad2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enP2p1s0_mac: "{{ mac1 }}" -enp1s0_ipv4: 10.3.174.66 -enp1s0_ipv4_gw: 10.3.174.254 -enp1s0_ipv4_nm: 24 -enp1s0_mac: "{{ mac2 }}" -enp1s0d1_mac: "{{ mac3 }}" -freezes: false -# enP2p1s0 is disabled/nothing -# enp1s0 is active network -# enp1s0d1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: 68:05:ca:8e:98:c7 -mac2: 50:6b:4b:6a:c4:90 -mac3: 50:6b:4b:6a:c4:91 -network_connections: - - autoconnect: no - mac: "{{ enP2p1s0_mac }}" - name: enP2p1s0 - state: down - type: ethernet - - autoconnect: yes - ip: - address: - - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0_ipv4_gw }}" - mac: "{{ enp1s0_mac }}" - name: enp1s0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0d1_mac }}" - name: enp1s0d1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -openqa_rngd: false -openqa_tap_iface: enp1s0 -# this is a moderately powerful machine (16c/32t, I think) -openqa_workers: 15 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] -nbde_device: /dev/sda3 diff --git a/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org deleted file mode 100644 index b211a5dc04..0000000000 --- a/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org +++ /dev/null @@ -1,59 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enp1s0f0np0_ipv4: 10.3.174.42 -enp1s0f0np0_ipv4_gw: 10.3.174.254 -enp1s0f0np0_ipv4_nm: 24 -enp1s0f0np0_mac: "{{ mac1 }}" -enp1s0f1np1_mac: "{{ mac2 }}" -freezes: false -# enp1s0f0np0 is default network -# enp1s0f1np1 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: 40:a6:b7:18:87:24 -mac2: 40:a6:b7:18:87:25 -mac3: ac:1f:6b:56:e5:90 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ enp1s0f0np0_ipv4 }}/{{ enp1s0f0np0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0f0np0_ipv4_gw }}" - mac: "{{ enp1s0f0np0_mac }}" - name: enp1s0f0np0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0f1np1_mac }}" - name: enp1s0f1np1 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -# has an HW RNG, so let's have rngd -openqa_rngd: true -openqa_tap_iface: enp1s0f0np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -# also means we need to bump the load average threshold -openqa_critical_threshold: 70 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] diff --git a/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org deleted file mode 100644 index 7cdde21001..0000000000 --- a/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org +++ /dev/null @@ -1,64 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -enp1s0f0np0_ipv4: 10.3.174.43 -enp1s0f0np0_ipv4_gw: 10.3.174.254 -enp1s0f0np0_ipv4_nm: 24 -enp1s0f0np0_mac: "{{ mac1 }}" -enp1s0f1np1_mac: "{{ mac2 }}" -enP2p1s0f0np0_mac: "{{ mac3 }}" -freezes: false -# enp1s0f0np0 is default network -# enp1s0f1np1 is disabled/nothing -# enP2p1s0f0np0 is disabled/nothing - -has_ipv4: yes -mac1: 40:a6:b7:18:86:b8 -mac2: 40:a6:b7:18:86:b9 -mac3: ac:1f:6b:59:70:6e -network_connections: - - autoconnect: yes - ip: - address: - - "{{ enp1s0f0np0_ipv4 }}/{{ enp1s0f0np0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enp1s0f0np0_ipv4_gw }}" - mac: "{{ enp1s0f0np0_mac }}" - name: enp1s0f0np0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ enp1s0f1np1_mac }}" - name: enp1s0f1np1 - state: down - type: ethernet - - autoconnect: no - mac: "{{ enP2p1s0f0np0_mac }}" - name: enP2p1s0f0np0 - state: down - type: ethernet -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -# has an HW RNG, so let's have rngd -openqa_rngd: true -openqa_tap_iface: enp1s0f0np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 15 -# also means we need to bump the load average threshold -openqa_critical_threshold: 70 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] diff --git a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org deleted file mode 100644 index 127db7d315..0000000000 --- a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org +++ /dev/null @@ -1,74 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1np0_ipv4: 10.3.174.21 -eno1np0_ipv4_gw: 10.3.174.254 -eno1np0_ipv4_nm: 24 -eno1np0_mac: "{{ mac1 }}" -eno2np1_mac: "{{ mac2 }}" -eno3_mac: "{{ mac3 }}" -eno4_mac: "{{ mac4 }}" -freezes: false -# eno1np0 is default network -# eno2np1 is disabled/nothing -# eno3 is disabled/nothing -# eno4 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: e4:43:4b:a7:98:66 -mac2: e4:43:4b:a7:98:68 -mac3: e4:43:4b:a7:98:86 -mac4: e4:43:4b:a7:98:87 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1np0_ipv4 }}/{{ eno1np0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1np0_ipv4_gw }}" - mac: "{{ eno1np0_mac }}" - name: eno1np0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ eno2np1_mac }}" - name: eno2np1 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno3_mac }}" - name: eno3 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno4_mac }}" - name: eno4 - state: down - type: ethernet -nrpe_procs_crit: 1600 -nrpe_procs_warn: 1400 -# Has a hardware RNG -openqa_rngd: true -openqa_tap_iface: eno1np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 -# also means we need to bump the load average threshold -openqa_critical_threshold: 60 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] diff --git a/inventory/host_vars/openqa-x86-worker01.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker01.rdu3.fedoraproject.org index e03344766c..b9f1900ea8 100644 --- a/inventory/host_vars/openqa-x86-worker01.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: c4:cb:e1:e1:56:86 diff --git a/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org deleted file mode 100644 index 2e88656587..0000000000 --- a/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org +++ /dev/null @@ -1,74 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1np0_ipv4: 10.3.174.22 -eno1np0_ipv4_gw: 10.3.174.254 -eno1np0_ipv4_nm: 24 -eno1np0_mac: "{{ mac1 }}" -eno2np1_mac: "{{ mac2 }}" -eno3_mac: "{{ mac3 }}" -eno4_mac: "{{ mac4 }}" -freezes: false -# eno1np0 is default network -# eno2np1 is disabled/nothing -# eno3 is disabled/nothing -# eno4 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: e4:43:4b:23:e8:cc -mac2: e4:43:4b:23:e8:ce -mac3: e4:43:4b:23:e8:ec -mac4: e4:43:4b:23:e8:ed -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1np0_ipv4 }}/{{ eno1np0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1np0_ipv4_gw }}" - mac: "{{ eno1np0_mac }}" - name: eno1np0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ eno2np1_mac }}" - name: eno2np1 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno3_mac }}" - name: eno3 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno4_mac }}" - name: eno4 - state: down - type: ethernet -nrpe_procs_crit: 1600 -nrpe_procs_warn: 1400 -# Has a hardware RNG -openqa_rngd: true -openqa_tap_iface: eno1np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 -# also means we need to bump the load average threshold -openqa_critical_threshold: 60 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] diff --git a/inventory/host_vars/openqa-x86-worker02.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker02.rdu3.fedoraproject.org index c48800b3c6..b703998abb 100644 --- a/inventory/host_vars/openqa-x86-worker02.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker02.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: c4:cb:e1:e1:57:02 diff --git a/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org deleted file mode 100644 index d363cd825d..0000000000 --- a/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org +++ /dev/null @@ -1,71 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1_ipv4: 10.3.174.23 -eno1_ipv4_gw: 10.3.174.254 -eno1_ipv4_nm: 24 -eno1_mac: "{{ mac1 }}" -eno2_mac: "{{ mac2 }}" -eno3_mac: "{{ mac3 }}" -eno4_mac: "{{ mac4 }}" -freezes: false -# eno1 is default network -# eno2 is disabled/nothing -# eno3 is disabled/nothing -# eno4 is disabled/nothing - -has_ipv4: yes -mac1: 24:6e:96:b0:e0:78 -mac2: 24:6e:96:b0:e0:7a -mac3: 24:6e:96:b0:e0:7c -mac4: 24:6e:96:b0:e0:7d -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1_ipv4 }}/{{ eno1_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1_ipv4_gw }}" - mac: "{{ eno1_mac }}" - name: eno1 - state: up - type: ethernet - - autoconnect: no - mac: "{{ eno2_mac }}" - name: eno2 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno3_mac }}" - name: eno3 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno4_mac }}" - name: eno4 - state: down - type: ethernet -nrpe_procs_crit: 1600 -nrpe_procs_warn: 1400 -# Has a hardware RNG -openqa_rngd: true -# this machines has 24 CPUs, 22 is our "just under one worker per -# CPU" rule-of-thumb, but it seems to be running out of memory so -# cut to 20 -openqa_workers: 20 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223'] diff --git a/inventory/host_vars/openqa-x86-worker03.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker03.rdu3.fedoraproject.org index f7c60ad8f5..503330efad 100644 --- a/inventory/host_vars/openqa-x86-worker03.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker03.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: c4:cb:e1:e1:45:ca diff --git a/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org deleted file mode 100644 index 818d66516e..0000000000 --- a/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org +++ /dev/null @@ -1,74 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1np0_ipv4: 10.3.174.24 -eno1np0_ipv4_gw: 10.3.174.254 -eno1np0_ipv4_nm: 24 -eno1np0_mac: "{{ mac1 }}" -eno2np1_mac: "{{ mac2 }}" -eno3_mac: "{{ mac3 }}" -eno4_mac: "{{ mac4 }}" -freezes: false -# eno1np0 is default network -# eno2np1 is disabled/nothing -# eno3 is disabled/nothing -# eno4 is disabled/nothing -# NOTE network configuration beyond the scope of linux-system-roles on -# this host is performed by the openqa/worker role - -has_ipv4: yes -mac1: e4:43:4b:24:10:aa -mac2: e4:43:4b:24:10:ca -mac3: e4:43:4b:24:10:ac -mac4: e4:43:4b:24:10:cb -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1np0_ipv4 }}/{{ eno1np0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1np0_ipv4_gw }}" - mac: "{{ eno1np0_mac }}" - name: eno1np0 - state: up - type: ethernet - - autoconnect: no - mac: "{{ eno2np1_mac }}" - name: eno2np1 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno3_mac }}" - name: eno3 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno4_mac }}" - name: eno4 - state: down - type: ethernet -nrpe_procs_crit: 1600 -nrpe_procs_warn: 1400 -# Has a hardware RNG -openqa_rngd: true -openqa_tap_iface: eno1np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 -# also means we need to bump the load average threshold -openqa_critical_threshold: 60 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] diff --git a/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org index c6d7dafada..9007ec393f 100644 --- a/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: c4:cb:e1:e1:56:b4 diff --git a/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org deleted file mode 100644 index c5275759e4..0000000000 --- a/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org +++ /dev/null @@ -1,71 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1_ipv4: 10.3.174.25 -eno1_ipv4_gw: 10.3.174.254 -eno1_ipv4_nm: 24 -eno1_mac: "{{ mac1 }}" -eno2_mac: "{{ mac2 }}" -eno3_mac: "{{ mac3 }}" -eno4_mac: "{{ mac4 }}" -freezes: false -# eno1 is default network -# een2 is disabled/nothing -# eno3 is disabled/nothing -# eno4 is disabled/nothing - -has_ipv4: yes -mac1: 24:6e:96:b1:4c:70 -mac2: 24:6e:96:b1:4c:72 -mac3: 24:6e:96:b1:4c:74 -mac4: 24:6e:96:b1:4c:75 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1_ipv4 }}/{{ eno1_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1_ipv4_gw }}" - mac: "{{ eno1_mac }}" - name: eno1 - state: up - type: ethernet - - autoconnect: no - mac: "{{ eno2_mac }}" - name: eno2 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno3_mac }}" - name: eno3 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno4_mac }}" - name: eno4 - state: down - type: ethernet -nrpe_procs_crit: 1600 -nrpe_procs_warn: 1400 -# Has a hardware RNG -openqa_rngd: true -openqa_tap_iface: eno1 -# xeon e5-2683v4, 32 physical CPUs -openqa_workers: 30 -openqa_critical_threshold: 60 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] diff --git a/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org index 57896b3475..e903213fe7 100644 --- a/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" freezes: false has_ipv4: yes mac0: c4:cb:e1:e1:61:54 diff --git a/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org deleted file mode 100644 index af3b7937c9..0000000000 --- a/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org +++ /dev/null @@ -1,71 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eno1_ipv4: 10.3.174.26 -eno1_ipv4_gw: 10.3.174.254 -eno1_ipv4_nm: 24 -eno1_mac: "{{ mac1 }}" -eno2_mac: "{{ mac2 }}" -eno3_mac: "{{ mac3 }}" -eno4_mac: "{{ mac4 }}" -freezes: false -# eno1 is default network -# eno2 is disabled/nothing -# eno3 is disabled/nothing -# eno4 is disabled/nothing - -has_ipv4: yes -mac1: 24:6e:96:b1:c8:00 -mac2: 24:6e:96:b1:c8:02 -mac3: 24:6e:96:b1:c8:04 -mac4: 24:6e:96:b1:c8:05 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eno1_ipv4 }}/{{ eno1_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eno1_ipv4_gw }}" - mac: "{{ eno1_mac }}" - name: eno1 - state: up - type: ethernet - - autoconnect: no - mac: "{{ eno2_mac }}" - name: eno2 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno3_mac }}" - name: eno3 - state: down - type: ethernet - - autoconnect: no - mac: "{{ eno4_mac }}" - name: eno4 - state: down - type: ethernet -nrpe_procs_crit: 1600 -nrpe_procs_warn: 1400 -# Has a hardware RNG -openqa_rngd: true -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 -# also means we need to bump the load average threshold -openqa_critical_threshold: 60 -sudoers: "{{ private }}/files/sudo/qavirt-sudoers" -# firewall ports for server->worker websockets connections -# this port is 'QEMUPORT plus 1' -# QEMUPORT is: -# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; -# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc -tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303'] diff --git a/inventory/host_vars/openqa01.iad2.fedoraproject.org b/inventory/host_vars/openqa01.iad2.fedoraproject.org deleted file mode 100644 index f78cca432e..0000000000 --- a/inventory/host_vars/openqa01.iad2.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -############################################################ -# networking -############################################################ -datacenter: iad2 -eth0_ipv4_gw: 10.3.174.254 -eth0_ipv4_ip: 10.3.174.52 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/32/Server/x86_64/os/ -############################################################ -# install -############################################################ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora-32-iad2 -############################################################ -# virtual machine -############################################################ -lvm_size: 800000 -mem_size: 16384 -nrpe_procs_crit: 300 -nrpe_procs_warn: 250 -num_cpus: 8 -vmhost: qvmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/os-control01.iad2.fedoraproject.org b/inventory/host_vars/os-control01.iad2.fedoraproject.org deleted file mode 100644 index f8ef0617dc..0000000000 --- a/inventory/host_vars/os-control01.iad2.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -baseiptables: true -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.65 -external: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 120g -max_mem_size: 16384 -mem_size: 16384 -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -num_cpus: 4 -resolvconf: "resolv.conf/iad2" -vmhost: vmhost-x86-01.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/os-control01.stg.iad2.fedoraproject.org b/inventory/host_vars/os-control01.stg.iad2.fedoraproject.org deleted file mode 100644 index ecde750846..0000000000 --- a/inventory/host_vars/os-control01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -baseiptables: true -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.50 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 100g -mem_size: 4096 -vmhost: vmhost-x86-11.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/pagure-stg01.fedoraproject.org b/inventory/host_vars/pagure-stg01.fedoraproject.org index c7711b9e01..1a4c21af39 100644 --- a/inventory/host_vars/pagure-stg01.fedoraproject.org +++ b/inventory/host_vars/pagure-stg01.fedoraproject.org @@ -2,8 +2,8 @@ datacenter: rdu-cc dns1: 8.8.8.8 dns2: 8.8.4.4 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" +dns_search1: "stg.rdu3.fedoraproject.org" +dns_search2: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" effective_cache_size: "6GB" eth0_ipv4_gw: 8.43.85.254 diff --git a/inventory/host_vars/pkgs01.iad2.fedoraproject.org b/inventory/host_vars/pkgs01.iad2.fedoraproject.org deleted file mode 100644 index 60c67ccd7d..0000000000 --- a/inventory/host_vars/pkgs01.iad2.fedoraproject.org +++ /dev/null @@ -1,27 +0,0 @@ ---- -additional_host_keytabs: - - pkgs.fedoraproject.org -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.116 -host_backup_targets: ['/srv/cache/lookaside'] -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -mem_size: 32768 -nagios_Check_Services: - swap: false -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -nrpe_procs_crit: 600 -nrpe_procs_warn: 500 -num_cpus: 16 -# DB used by pagure -pagure_db_host: db01.iad2.fedoraproject.org -sar_output_file: dist_git.json -# GDPR SAR variables - dist_dit -sar_script: /usr/local/bin/pagure_sar.py -sar_script_user: root -ssh_hostnames: - - pkgs.fedoraproject.org -swap: false -vmhost: bvmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org b/inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org deleted file mode 100644 index 01532ce763..0000000000 --- a/inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -# temp fix to get htis box working -baseiptables: False -datacenter: iad2 -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.74 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -# DB used by pagure -pagure_db_host: db01.stg.iad2.fedoraproject.org -ssh_hostnames: - - pkgs.stg.fedoraproject.org -vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/proxy01.iad2.fedoraproject.org b/inventory/host_vars/proxy01.iad2.fedoraproject.org deleted file mode 100644 index 281651d542..0000000000 --- a/inventory/host_vars/proxy01.iad2.fedoraproject.org +++ /dev/null @@ -1,47 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "vpn.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ipv4: 10.3.163.74 -eth0_ipv4_gw: 10.3.163.254 -# -# This host is externally reachable -# -external: true -freezes: true -has_ipv4: yes -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 100000 -mac0: 52:54:00:76:9f:85 -mem_size: 32768 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -# This is consumed by the roles/fedora-web/main role -sponsor: redhat -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/proxy01.stg.iad2.fedoraproject.org b/inventory/host_vars/proxy01.stg.iad2.fedoraproject.org deleted file mode 100644 index 7fedbecacf..0000000000 --- a/inventory/host_vars/proxy01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.74 -external: true -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -# This is consumed by the roles/fedora-web/main role -sponsor: redhat -vmhost: vmhost-x86-02.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/proxy02.stg.iad2.fedoraproject.org b/inventory/host_vars/proxy02.stg.iad2.fedoraproject.org deleted file mode 100644 index 61e7d30473..0000000000 --- a/inventory/host_vars/proxy02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.75 -external: true -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -# This is consumed by the roles/fedora-web/main role -sponsor: redhat -vmhost: vmhost-x86-09.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: false diff --git a/inventory/host_vars/proxy10.iad2.fedoraproject.org b/inventory/host_vars/proxy10.iad2.fedoraproject.org deleted file mode 100644 index 3298242f7e..0000000000 --- a/inventory/host_vars/proxy10.iad2.fedoraproject.org +++ /dev/null @@ -1,47 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "vpn.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ipv4: 10.3.163.75 -eth0_ipv4_gw: 10.3.163.254 -# -# This host is externally reachable -# -external: true -freezes: true -has_ipv4: yes -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -lvm_size: 100000 -mac0: 52:54:00:55:8d:ca -mem_size: 32768 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 8 -# This is consumed by the roles/fedora-web/main role -sponsor: redhat -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/proxy101.iad2.fedoraproject.org b/inventory/host_vars/proxy101.iad2.fedoraproject.org deleted file mode 100644 index c5c28c169c..0000000000 --- a/inventory/host_vars/proxy101.iad2.fedoraproject.org +++ /dev/null @@ -1,41 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "vpn.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ipv4: 10.3.163.76 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -has_ipv4: yes -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -mac0: 52:54:00:1F:48:0A -mem_size: 16384 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -# This is consumed by the roles/fedora-web/main role -sponsor: redhat -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/proxy110.iad2.fedoraproject.org b/inventory/host_vars/proxy110.iad2.fedoraproject.org deleted file mode 100644 index 5923b78435..0000000000 --- a/inventory/host_vars/proxy110.iad2.fedoraproject.org +++ /dev/null @@ -1,41 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "vpn.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ipv4: 10.3.163.77 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -has_ipv4: yes -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -mac0: 52:54:00:04:49:7a -mem_size: 16384 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet - mtu: 9000 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -# This is consumed by the roles/fedora-web/main role -sponsor: redhat -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/qvmhost-x86-01.iad2.fedoraproject.org b/inventory/host_vars/qvmhost-x86-01.iad2.fedoraproject.org deleted file mode 100644 index 7e287dfa2d..0000000000 --- a/inventory/host_vars/qvmhost-x86-01.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_dev: eno1 -br0_gw: 10.3.174.254 -br0_ip: 10.3.174.11 -br0_nm: 255.255.255.0 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns: 10.3.163.33 -mac1: e4:43:4b:a8:c1:fe -mac2: e4:43:4b:a8:c2:00 -mac3: e4:43:4b:a8:c2:1e -mac4: e4:43:4b:a8:c2:1f -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ip }}/24" - dhcp4: no - dns: - - 10.3.163.33 - - 10.3.163.34 - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - gateway4: "{{ br0_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/qvmhost-x86-01.rdu3.fedoraproject.org b/inventory/host_vars/qvmhost-x86-01.rdu3.fedoraproject.org index a2da54342d..0e7cdf03cb 100644 --- a/inventory/host_vars/qvmhost-x86-01.rdu3.fedoraproject.org +++ b/inventory/host_vars/qvmhost-x86-01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cbe1:e1:57:94 mac1: c4:cbe1:e1:57:95 diff --git a/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org deleted file mode 100644 index 8180ab7e52..0000000000 --- a/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -br0_dev: eno1 -br0_gw: 10.3.174.254 -br0_ip: 10.3.174.12 -br0_nm: 255.255.255.0 -br0_port0_mac: '{{ mac1 }}' -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.33 -dns_search1: iad2.fedoraproject.org -dns_search2: fedoraproject.org -mac1: e4:43:4b:a8:b3:0e -mac2: e4:43:4b:a8:b3:10 -mac3: e4:43:4b:a8:b3:2e -mac4: e4:43:4b:a8:b3:2f -network_connections: - - autoconnect: true - ip: - address: - - '{{ br0_ip }}/24' - dhcp4: false - dns: - - '{{ dns1 }}' - - '{{ dns2 }}' - dns_search: - - '{{ dns_search1 }}' - - '{{ dns_search2 }}' - gateway4: '{{ br0_gw }}' - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: '{{ br0_port0_mac }}' - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/rabbitmq01.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq01.iad2.fedoraproject.org deleted file mode 100644 index 347e4abdf3..0000000000 --- a/inventory/host_vars/rabbitmq01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.78 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/rabbitmq01.rdu3.fedoraproject.org b/inventory/host_vars/rabbitmq01.rdu3.fedoraproject.org index 62e5eadf64..89b761e2b1 100644 --- a/inventory/host_vars/rabbitmq01.rdu3.fedoraproject.org +++ b/inventory/host_vars/rabbitmq01.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.78 diff --git a/inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org deleted file mode 100644 index 7c37d46532..0000000000 --- a/inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.78 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-09.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/rabbitmq02.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq02.iad2.fedoraproject.org deleted file mode 100644 index a5b55e2106..0000000000 --- a/inventory/host_vars/rabbitmq02.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.79 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/rabbitmq02.rdu3.fedoraproject.org b/inventory/host_vars/rabbitmq02.rdu3.fedoraproject.org index 3afb8b3e1a..5eb93f5c04 100644 --- a/inventory/host_vars/rabbitmq02.rdu3.fedoraproject.org +++ b/inventory/host_vars/rabbitmq02.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.79 diff --git a/inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org deleted file mode 100644 index e33ac37e41..0000000000 --- a/inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.79 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-12.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/rabbitmq03.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq03.iad2.fedoraproject.org deleted file mode 100644 index 26ba89cd6f..0000000000 --- a/inventory/host_vars/rabbitmq03.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.80 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/rabbitmq03.rdu3.fedoraproject.org b/inventory/host_vars/rabbitmq03.rdu3.fedoraproject.org index f0f05c415b..2fd8e55c8a 100644 --- a/inventory/host_vars/rabbitmq03.rdu3.fedoraproject.org +++ b/inventory/host_vars/rabbitmq03.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.80 diff --git a/inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org deleted file mode 100644 index f31b87a5ff..0000000000 --- a/inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.80 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/secondary01.iad2.fedoraproject.org b/inventory/host_vars/secondary01.iad2.fedoraproject.org deleted file mode 100644 index e16ab6b445..0000000000 --- a/inventory/host_vars/secondary01.iad2.fedoraproject.org +++ /dev/null @@ -1,16 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.86 -# -# This host is externally reachable -# -external: true -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -lvm_size: 40000 -mem_size: 10240 -num_cpus: 4 -public_hostname: secondary01.fedoraproject.org -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sign-bridge01.iad2.fedoraproject.org b/inventory/host_vars/sign-bridge01.iad2.fedoraproject.org deleted file mode 100644 index 43cb311dc7..0000000000 --- a/inventory/host_vars/sign-bridge01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_ip: 10.3.169.120 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: bvmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sign-bridge01.stg.iad2.fedoraproject.org b/inventory/host_vars/sign-bridge01.stg.iad2.fedoraproject.org deleted file mode 100644 index 8c102826fb..0000000000 --- a/inventory/host_vars/sign-bridge01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.27 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: bvmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sign-vault01.iad2.fedoraproject.org b/inventory/host_vars/sign-vault01.iad2.fedoraproject.org deleted file mode 100644 index c9db4d3878..0000000000 --- a/inventory/host_vars/sign-vault01.iad2.fedoraproject.org +++ /dev/null @@ -1,7 +0,0 @@ ---- -br0_dev: eno1 -br0_gw: 10.3.169.254 -br0_ip: 10.3.169.26 -br0_nm: 255.255.255.0 -datacenter: iad2 -dns: 10.3.163.33 diff --git a/inventory/host_vars/sign-vault01.rdu3.fedoraproject.org b/inventory/host_vars/sign-vault01.rdu3.fedoraproject.org index ed05797ba4..39248ac614 100644 --- a/inventory/host_vars/sign-vault01.rdu3.fedoraproject.org +++ b/inventory/host_vars/sign-vault01.rdu3.fedoraproject.org @@ -7,7 +7,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:5f:ec mac1: c4:cb:e1:e1:5f:ed diff --git a/inventory/host_vars/sign-vault01.stg.iad2.fedoraproject.org b/inventory/host_vars/sign-vault01.stg.iad2.fedoraproject.org deleted file mode 100644 index b5b11aac60..0000000000 --- a/inventory/host_vars/sign-vault01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: staging -eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_ip: 10.3.167.28 -external: false -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: bvmhost-x86-05.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sign-vault02.iad2.fedoraproject.org b/inventory/host_vars/sign-vault02.iad2.fedoraproject.org deleted file mode 100644 index cbd43666a4..0000000000 --- a/inventory/host_vars/sign-vault02.iad2.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth1_ipv4_ip: 10.3.169.27 -eth1_ipv4_gw: 10.3.169.254 -eth1_ipv4_nm: 24 -eth1_mac: "{{ mac0 }}" -external: false -has_ipv4: yes -mac0: B4:45:06:FB:8B:3E -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth1_ipv4_ip }}/{{ eth1_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth1_ipv4_gw }}" - mac: "{{ eth1_mac }}" - name: eth1 - state: up - type: ethernet -resolvconf: "resolv.conf/iad2" diff --git a/inventory/host_vars/sundries01.iad2.fedoraproject.org b/inventory/host_vars/sundries01.iad2.fedoraproject.org deleted file mode 100644 index 9b5bb47261..0000000000 --- a/inventory/host_vars/sundries01.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.81 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# This overrides a group var and lets the playbook know that we should -# install special cron jobs here. -master_sundries_node: True -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sundries01.stg.iad2.fedoraproject.org b/inventory/host_vars/sundries01.stg.iad2.fedoraproject.org deleted file mode 100644 index ba52bead66..0000000000 --- a/inventory/host_vars/sundries01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.33 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# This overrides a group var and lets the playbook know that we should -# install special cron jobs here. -master_sundries_node: True -mirrorlist_procs: 45 -vmhost: vmhost-x86-02.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sundries02.iad2.fedoraproject.org b/inventory/host_vars/sundries02.iad2.fedoraproject.org deleted file mode 100644 index eee3d68034..0000000000 --- a/inventory/host_vars/sundries02.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.101 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# This overrides a group var and lets the playbook know that we should -# install special cron jobs here. -master_sundries_node: True -virt_install_command: "{{ virt_install_command_one_nic }}" -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/sundries02.stg.iad2.fedoraproject.org b/inventory/host_vars/sundries02.stg.iad2.fedoraproject.org deleted file mode 100644 index cff4d799ac..0000000000 --- a/inventory/host_vars/sundries02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.71 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# This overrides a group var and lets the playbook know that we should -# install special cron jobs here. -master_sundries_node: True -mirrorlist_procs: 45 -vmhost: vmhost-x86-02.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/tang01.iad2.fedoraproject.org b/inventory/host_vars/tang01.iad2.fedoraproject.org deleted file mode 100644 index 01423a5caa..0000000000 --- a/inventory/host_vars/tang01.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.37 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/tang01.rdu3.fedoraproject.org b/inventory/host_vars/tang01.rdu3.fedoraproject.org index d340773f8c..72013fc401 100644 --- a/inventory/host_vars/tang01.rdu3.fedoraproject.org +++ b/inventory/host_vars/tang01.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.37 ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ diff --git a/inventory/host_vars/tang02.iad2.fedoraproject.org b/inventory/host_vars/tang02.iad2.fedoraproject.org deleted file mode 100644 index 6d1d7a431d..0000000000 --- a/inventory/host_vars/tang02.iad2.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.38 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 2 -vmhost: vmhost-x86-03.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/tang02.rdu3.fedoraproject.org b/inventory/host_vars/tang02.rdu3.fedoraproject.org index 49e916c8bf..4e5253cdda 100644 --- a/inventory/host_vars/tang02.rdu3.fedoraproject.org +++ b/inventory/host_vars/tang02.rdu3.fedoraproject.org @@ -4,7 +4,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.38 ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ diff --git a/inventory/host_vars/value02.iad2.fedoraproject.org b/inventory/host_vars/value02.iad2.fedoraproject.org deleted file mode 100644 index 5320c23267..0000000000 --- a/inventory/host_vars/value02.iad2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.110 -host_backup_targets: ['/srv', '/var/lib/zodbot'] -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -sar_output_file: meetbot.json -# GDPR SAR variables - meetbot -sar_script: /usr/local/bin/meetbot_sar.py -sar_script_user: root -vmhost: vmhost-x86-04.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/value02.stg.iad2.fedoraproject.org b/inventory/host_vars/value02.stg.iad2.fedoraproject.org deleted file mode 100644 index 6ba7340c8d..0000000000 --- a/inventory/host_vars/value02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.64 -eth0_nm: 255.255.255.0 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-iad2 -vmhost: vmhost-x86-06.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org deleted file mode 100644 index a6ba5958b2..0000000000 --- a/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.11 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:70:88 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-01.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.rdu3.fedoraproject.org index d238c0a2bb..3f0dadc3ba 100644 --- a/inventory/host_vars/vmhost-x86-01.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-01.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:57:0e mac1: c4:cb:e1:e1:57:0f diff --git a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org deleted file mode 100644 index 4e05a3cd8c..0000000000 --- a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,43 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4_ip: 10.3.166.11 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: a8:3c:a5:36:2c:2c -mac2: a8:3c:a5:36:2c:2d -mac3: 6c:fe:54:88:f0:d4 -mac4: 6c:fe:54:88:f0:d5 -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4_ip }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-01.stg.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.stg.rdu3.fedoraproject.org index a0909a3435..330b4d6f6a 100644 --- a/inventory/host_vars/vmhost-x86-01.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-01.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:71:5a mac1: c4:cb:e1:e1:71:5b diff --git a/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org deleted file mode 100644 index 66d34ac874..0000000000 --- a/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.12 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:ba:e8:44 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-02.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.rdu3.fedoraproject.org index 85bcd5522d..1ae422bec6 100644 --- a/inventory/host_vars/vmhost-x86-02.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-02.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:60:2a mac1: c4:cb:e1:e1:60:2b diff --git a/inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org deleted file mode 100644 index 8e559c8dfc..0000000000 --- a/inventory/host_vars/vmhost-x86-02.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,43 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.12 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 24:6e:96:13:ed:dc -mac2: 24:6e:96:13:ed:dd -mac3: 24:6e:96:13:ed:d8 -mac4: 24:6e:96:13:ed:da -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-02.stg.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.stg.rdu3.fedoraproject.org index d117d42aa9..0c3151f30d 100644 --- a/inventory/host_vars/vmhost-x86-02.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-02.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:6e:96 mac1: c4:cb:e1:e1:6e:97 diff --git a/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org deleted file mode 100644 index f9cd50b608..0000000000 --- a/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.13 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:28:cc -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-03.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-03.rdu3.fedoraproject.org index 24adcd0d56..2e341e81c7 100644 --- a/inventory/host_vars/vmhost-x86-03.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-03.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:6e:9a mac1: c4:cb:e1:e1:6e:9b diff --git a/inventory/host_vars/vmhost-x86-03.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-03.stg.iad2.fedoraproject.org deleted file mode 100644 index 1f80e84d95..0000000000 --- a/inventory/host_vars/vmhost-x86-03.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,42 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.13 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 24:6e:96:05:d9:fc -mac2: 24:6e:96:05:d9:fd -mac3: 24:6e:96:05:d9:f8 -mac4: 24:6e:96:05:d9:fa -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-03.stg.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-03.stg.rdu3.fedoraproject.org index 00b219603e..69a182dc11 100644 --- a/inventory/host_vars/vmhost-x86-03.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-03.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:70:5e mac1: c4:cb:e1:e1:70:5f diff --git a/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org deleted file mode 100644 index c97fda30e4..0000000000 --- a/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.14 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:62:a8 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-04.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.rdu3.fedoraproject.org index 99e091cb2a..4b90d1e750 100644 --- a/inventory/host_vars/vmhost-x86-04.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-04.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:70:64 mac1: c4:cb:e1:e1:70:65 diff --git a/inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org deleted file mode 100644 index f15bde066b..0000000000 --- a/inventory/host_vars/vmhost-x86-04.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,42 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.14 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 24:6e:96:05:d7:84 -mac2: 24:6e:96:05:d7:85 -mac3: 24:6e:96:05:d7:80 -mac4: 24:6e:96:05:d7:82 -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-04.stg.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.stg.rdu3.fedoraproject.org index 4526d224a3..0f73d8b481 100644 --- a/inventory/host_vars/vmhost-x86-04.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-04.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:70:60 mac1: c4:cb:e1:e1:70:61 diff --git a/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org deleted file mode 100644 index 485f9392a4..0000000000 --- a/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.15 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:ae:4b:b8 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-05.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.rdu3.fedoraproject.org index e7039652eb..9d04117da4 100644 --- a/inventory/host_vars/vmhost-x86-05.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-05.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:71:6c mac1: c4:cb:e1:e1:71:6d diff --git a/inventory/host_vars/vmhost-x86-05.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.stg.iad2.fedoraproject.org deleted file mode 100644 index a651b59470..0000000000 --- a/inventory/host_vars/vmhost-x86-05.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.15 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac5 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 18:66:da:f7:7a:58 -mac2: 18:66:da:f7:7a:59 -mac3: 18:66:da:f7:7a:5a -mac4: 18:66:da:f7:7a:5b -mac5: a0:36:9f:de:88:28 -mac6: a0:36:9f:de:88:2a -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-05.stg.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.stg.rdu3.fedoraproject.org index 5667554569..9f95ce74fc 100644 --- a/inventory/host_vars/vmhost-x86-05.stg.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-05.stg.rdu3.fedoraproject.org @@ -8,7 +8,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "stg.rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "stg.iad2.fedoraproject.org" has_ipv4: yes mac0: c4:cb:e1:e1:71:66 mac1: c4:cb:e1:e1:71:67 diff --git a/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org deleted file mode 100644 index 4393a75ca3..0000000000 --- a/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.16 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:b1:28:ee -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-06.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-06.stg.iad2.fedoraproject.org deleted file mode 100644 index 1b6993cbc2..0000000000 --- a/inventory/host_vars/vmhost-x86-06.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.16 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac5 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 18:66:da:f7:61:58 -mac2: 18:66:da:f7:61:59 -mac3: 18:66:da:f7:61:5a -mac4: 18:66:da:f7:61:5b -mac5: a0:36:9f:de:85:bc -mac6: a0:36:9f:de:85:be -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org deleted file mode 100644 index 7f99f772c5..0000000000 --- a/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org +++ /dev/null @@ -1,35 +0,0 @@ ---- -br0_ipv4: 10.3.163.17 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: e4:43:4b:22:ce:ca -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-07.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-07.stg.iad2.fedoraproject.org deleted file mode 100644 index af53d1fa58..0000000000 --- a/inventory/host_vars/vmhost-x86-07.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.17 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac4 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 80:18:44:de:4d:fc -mac2: 80:18:44:de:4d:fd -mac3: 80:18:44:de:4d:fe -mac4: a0:36:9f:f1:83:e0 -mac5: 80:18:44:de:4d:ff -mac6: a0:36:9f:f1:83:e2 -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org deleted file mode 100644 index 52f59c0f79..0000000000 --- a/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -br0_ipv4_ip: 10.3.163.28 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac1: 6c:fe:54:88:ec:34 -nbde: false -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4_ip }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-08.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-08.stg.iad2.fedoraproject.org deleted file mode 100644 index a4535d5753..0000000000 --- a/inventory/host_vars/vmhost-x86-08.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,43 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.18 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac3 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: 24:6e:96:c1:6e:bc -mac2: 24:6e:96:c1:6e:bd -mac3: 24:6e:96:c1:6e:b8 -mac4: 24:6e:96:c1:6e:ba -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org deleted file mode 100644 index 3efaac7822..0000000000 --- a/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org +++ /dev/null @@ -1,36 +0,0 @@ ---- -br0_ipv4: 10.3.163.29 -br0_ipv4_gw: 10.3.163.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac2 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -has_ipv4: yes -mac2: 24:6e:96:b1:61:c0 -nbde: false -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org deleted file mode 100644 index a0ac7260df..0000000000 --- a/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,43 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.19 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac4 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: C8:4B:D6:89:F7:5C -mac2: C8:4B:D6:89:F7:5D -mac3: 6C:FE:54:57:80:2C -mac4: 6C:FE:54:57:80:2D -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org deleted file mode 100644 index b8d2478755..0000000000 --- a/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.28 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: E4:43:4B:F7:B7:B8 -mac2: E4:43:4B:F7:B7:BA -mac3: E4:43:4B:F7:B7:D8 -mac4: E4:43:4B:F7:B7:D9 -mgmt_ipv4: 10.3.160.46 -mgmt_mac: 2c:ea:7f:f3:6c:be -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org deleted file mode 100644 index dea2020fb8..0000000000 --- a/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -# This virthost only has stg instances, so it doesn't freeze -br0_ipv4: 10.3.166.29 -br0_ipv4_gw: 10.3.166.254 -br0_ipv4_nm: 24 -br0_port0_mac: "{{ mac1 }}" -datacenter: iad2 -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -freezes: false -has_ipv4: yes -mac1: E4:43:4B:F7:AD:10 -mac2: E4:43:4B:F7:AD:12 -mac3: E4:43:4B:F7:AD:30 -mac4: E4:43:4B:F7:AD:31 -mgmt_ipv4: 10.3.160.47 -mgmt_mac: 2c:ea:7f:f3:82:fc -nested: true -network_connections: - - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ br0_ipv4_gw }}" - name: br0 - state: up - type: bridge - mtu: 9000 - - mac: "{{ br0_port0_mac }}" - master: br0 - name: br0-port0 - state: up - type: ethernet - mtu: 9000 diff --git a/inventory/host_vars/wiki01.iad2.fedoraproject.org b/inventory/host_vars/wiki01.iad2.fedoraproject.org deleted file mode 100644 index 9167a6af62..0000000000 --- a/inventory/host_vars/wiki01.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.83 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-02.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/wiki01.rdu3.fedoraproject.org b/inventory/host_vars/wiki01.rdu3.fedoraproject.org index 546eb6df7b..a24c84ce2b 100644 --- a/inventory/host_vars/wiki01.rdu3.fedoraproject.org +++ b/inventory/host_vars/wiki01.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.83 diff --git a/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org b/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org deleted file mode 100644 index ad1c395801..0000000000 --- a/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.24 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-07.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/wiki02.iad2.fedoraproject.org b/inventory/host_vars/wiki02.iad2.fedoraproject.org deleted file mode 100644 index 30fac28220..0000000000 --- a/inventory/host_vars/wiki02.iad2.fedoraproject.org +++ /dev/null @@ -1,8 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.102 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora -vmhost: vmhost-x86-06.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/wiki02.rdu3.fedoraproject.org b/inventory/host_vars/wiki02.rdu3.fedoraproject.org index 9b151ad9c7..a3f077fdc8 100644 --- a/inventory/host_vars/wiki02.rdu3.fedoraproject.org +++ b/inventory/host_vars/wiki02.rdu3.fedoraproject.org @@ -5,7 +5,6 @@ dns1: 10.16.163.33 dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search2: "fedoraproject.org" -dns_search3: "iad2.fedoraproject.org" # end eth0_ipv4_gw: 10.16.163.254 eth0_ipv4_ip: 10.16.163.102 diff --git a/inventory/host_vars/worker01.ocp.iad2.fedoraproject.org b/inventory/host_vars/worker01.ocp.iad2.fedoraproject.org deleted file mode 100644 index c4c1ae4720..0000000000 --- a/inventory/host_vars/worker01.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.123 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "68:05:CA:CE:A3:C9" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno34 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.163.165/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -rhcos_kernel_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 86824e03f8..0000000000 --- a/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,46 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.118 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "68:05:CA:CE:A2:AC" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno1 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -rhcos_kernel_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker02.ocp.iad2.fedoraproject.org b/inventory/host_vars/worker02.ocp.iad2.fedoraproject.org deleted file mode 100644 index 4dc18fd9e6..0000000000 --- a/inventory/host_vars/worker02.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.124 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "68:05:CA:CE:A2:90" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno33 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.163.165/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -rhcos_kernel_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 7eaa05016b..0000000000 --- a/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,46 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.119 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "68:05:CA:CE:A3:24" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno1 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -rhcos_kernel_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker03.ocp.iad2.fedoraproject.org b/inventory/host_vars/worker03.ocp.iad2.fedoraproject.org deleted file mode 100644 index 3d3c053440..0000000000 --- a/inventory/host_vars/worker03.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.125 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "68:05:CA:CE:A7:4C" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno33 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.163.165/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -rhcos_kernel_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 70910cf34e..0000000000 --- a/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,46 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.120 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "68:05:CA:CE:A5:10" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno1 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -rhcos_kernel_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker04.ocp.iad2.fedoraproject.org b/inventory/host_vars/worker04.ocp.iad2.fedoraproject.org deleted file mode 100644 index b92f7107f7..0000000000 --- a/inventory/host_vars/worker04.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.127 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "24:6E:96:B0:E0:78" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno34 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.163.165/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -rhcos_kernel_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker04.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker04.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 798b054772..0000000000 --- a/inventory/host_vars/worker04.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.122 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 16384 -mem_size: 16384 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-06.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/worker05.ocp.iad2.fedoraproject.org b/inventory/host_vars/worker05.ocp.iad2.fedoraproject.org deleted file mode 100644 index 941abed8b9..0000000000 --- a/inventory/host_vars/worker05.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.128 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "24:6E:96:B1:4C:70" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno34 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.163.165/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -rhcos_kernel_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/worker05.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker05.ocp.stg.iad2.fedoraproject.org deleted file mode 100644 index 0f76eb6f63..0000000000 --- a/inventory/host_vars/worker05.ocp.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,48 +0,0 @@ ---- -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "stg.iad2.fedoraproject.org" -dns_search2: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.166.123 -eth0_ipv4_gw: 10.3.166.254 -freezes: false -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -lvm_size: 120g -mac0: "{{ ansible_default_ipv4.macaddress }}" -max_mem_size: 16384 -mem_size: 16384 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -num_cpus: 4 -rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" -rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.166.50/rhcos/" -virt_install_command: "{{ virt_install_command_pxe_rhcos }}" -vmhost: vmhost-x86-07.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/worker06.ocp.iad2.fedoraproject.org b/inventory/host_vars/worker06.ocp.iad2.fedoraproject.org deleted file mode 100644 index 82ebf86618..0000000000 --- a/inventory/host_vars/worker06.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,45 +0,0 @@ ---- -arch: x86_64 -datacenter: iad2 -dns: "{{ dns1 }}" -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search3: "fedoraproject.org" -eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.3.163.129 -eth0_ipv4_gw: 10.3.163.254 -freezes: true -gw: "{{ eth0_ipv4_gw }}" -has_ipv4: yes -install_dev: /dev/sda -mac0: "24:6E:96:B1:5E:B0" -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - - "{{ dns_search3 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ mac0 }}" - name: eth0 - state: up - type: ethernet -nm: 255.255.255.0 -nrpe_procs_crit: 1400 -nrpe_procs_warn: 1200 -pxe_bootdev: eno34 -rhcos_ignition_file_url: "http://10.3.163.65/rhcos/worker.ign" -rhcos_initrd_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" -rhcos_install_img_url: "http://10.3.163.165/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" -rhcos_install_rootfs_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" -rhcos_install_url: "http://10.3.163.65/rhcos/" -rhcos_kernel_url: "http://10.3.163.65/rhcos/rhcos-{{ rhcos_version }}-x86_64-live-kernel.x86_64" -vpn: true diff --git a/inventory/host_vars/zabbix01.iad2.fedoraproject.org b/inventory/host_vars/zabbix01.iad2.fedoraproject.org deleted file mode 100644 index 9b0d4dda5c..0000000000 --- a/inventory/host_vars/zabbix01.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.198 -eth0_nm: 255.255.255.0 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-05.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/zabbix01.stg.iad2.fedoraproject.org b/inventory/host_vars/zabbix01.stg.iad2.fedoraproject.org deleted file mode 100644 index 15be434116..0000000000 --- a/inventory/host_vars/zabbix01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_gw: 10.3.166.254 -eth0_ipv4_ip: 10.3.166.61 -eth0_nm: 255.255.255.0 -ks_repo: https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ -ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel -vmhost: vmhost-x86-07.stg.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/inventory b/inventory/inventory index c81f17ebda..f176f9e15e 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1,68 +1,38 @@ [rabbitmq] -rabbitmq01.iad2.fedoraproject.org -rabbitmq02.iad2.fedoraproject.org -rabbitmq03.iad2.fedoraproject.org rabbitmq01.rdu3.fedoraproject.org rabbitmq02.rdu3.fedoraproject.org rabbitmq03.rdu3.fedoraproject.org -[rabbitmq_iad2] -rabbitmq01.iad2.fedoraproject.org -rabbitmq02.iad2.fedoraproject.org -rabbitmq03.iad2.fedoraproject.org - [rabbitmq_rdu3] rabbitmq01.rdu3.fedoraproject.org rabbitmq02.rdu3.fedoraproject.org rabbitmq03.rdu3.fedoraproject.org [rabbitmq_stg] -rabbitmq01.stg.iad2.fedoraproject.org -rabbitmq02.stg.iad2.fedoraproject.org -rabbitmq03.stg.iad2.fedoraproject.org rabbitmq01.stg.rdu3.fedoraproject.org rabbitmq02.stg.rdu3.fedoraproject.org rabbitmq03.stg.rdu3.fedoraproject.org -[rabbitmq_stg_iad2] -rabbitmq01.stg.iad2.fedoraproject.org -rabbitmq02.stg.iad2.fedoraproject.org -rabbitmq03.stg.iad2.fedoraproject.org - [rabbitmq_stg_rdu3] rabbitmq01.stg.rdu3.fedoraproject.org rabbitmq02.stg.rdu3.fedoraproject.org rabbitmq03.stg.rdu3.fedoraproject.org [releng_compose] -compose-branched01.iad2.fedoraproject.org -compose-iot01.iad2.fedoraproject.org -compose-rawhide01.iad2.fedoraproject.org -compose-x86-01.iad2.fedoraproject.org compose-branched01.rdu3.fedoraproject.org compose-iot01.rdu3.fedoraproject.org compose-rawhide01.rdu3.fedoraproject.org compose-x86-01.rdu3.fedoraproject.org [releng_compose_eln] -compose-eln01.iad2.fedoraproject.org compose-eln01.rdu3.fedoraproject.org -[releng_compose_eln_iad2] -compose-eln01.iad2.fedoraproject.org - [releng_compose_eln_rdu3] compose-eln01.rdu3.fedoraproject.org [releng_compose_riscv] compose-x86-riscv01.rdu3.fedoraproject.org -[releng_compose_iad2] -compose-branched01.iad2.fedoraproject.org -compose-iot01.iad2.fedoraproject.org -compose-rawhide01.iad2.fedoraproject.org -compose-x86-01.iad2.fedoraproject.org - [releng_compose_rdu3] compose-branched01.rdu3.fedoraproject.org compose-iot01.rdu3.fedoraproject.org @@ -70,12 +40,8 @@ compose-rawhide01.rdu3.fedoraproject.org compose-x86-01.rdu3.fedoraproject.org [releng_compose_stg] -compose-x86-01.stg.iad2.fedoraproject.org compose-x86-01.stg.rdu3.fedoraproject.org -[releng_compose_stg_iad2] -compose-x86-01.stg.iad2.fedoraproject.org - [releng_compose_stg_rdu3] compose-x86-01.stg.rdu3.fedoraproject.org @@ -85,60 +51,29 @@ retrace03.rdu-cc.fedoraproject.org [gdpr_delete] [certgetter] -certgetter01.iad2.fedoraproject.org certgetter01.rdu3.fedoraproject.org [certgetter_rdu3] certgetter01.rdu3.fedoraproject.org -[certgetter_iad2] -certgetter01.iad2.fedoraproject.org - [backup] -backup01.iad2.fedoraproject.org backup01.rdu3.fedoraproject.org -[backup_iad2] -backup01.iad2.fedoraproject.org - [backup_rdu3] backup01.rdu3.fedoraproject.org [bastion] -bastion01.iad2.fedoraproject.org -bastion02.iad2.fedoraproject.org bastion01.rdu3.fedoraproject.org bastion02.rdu3.fedoraproject.org [bastion_stg] -# bastion01.stg.iad2.fedoraproject.org - -[bastion_iad2] -bastion01.iad2.fedoraproject.org -bastion02.iad2.fedoraproject.org +# bastion01.stg.rdu3.fedoraproject.org [bastion_rdu3] bastion01.rdu3.fedoraproject.org bastion02.rdu3.fedoraproject.org -[centos_ipa_client_stg] -centos-ipa-client01.stg.iad2.fedoraproject.org -centos-ipa-client02.stg.iad2.fedoraproject.org -centos-ipa-client03.stg.iad2.fedoraproject.org -centos-ipa-client04.stg.iad2.fedoraproject.org - [bvirthost] -bvmhost-x86-01.iad2.fedoraproject.org -bvmhost-x86-02.iad2.fedoraproject.org -bvmhost-x86-03.iad2.fedoraproject.org -bvmhost-x86-04.iad2.fedoraproject.org -bvmhost-x86-05.iad2.fedoraproject.org -bvmhost-x86-06.iad2.fedoraproject.org -bvmhost-x86-07.iad2.fedoraproject.org -bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org -bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-05.stg.iad2.fedoraproject.org bvmhost-x86-01.rdu3.fedoraproject.org bvmhost-x86-02.rdu3.fedoraproject.org bvmhost-x86-03.rdu3.fedoraproject.org @@ -150,19 +85,6 @@ bvmhost-x86-02.stg.rdu3.fedoraproject.org bvmhost-x86-03.stg.rdu3.fedoraproject.org bvmhost-x86-riscv01.rdu3.fedoraproject.org -[bvirthost_iad2] -bvmhost-x86-01.iad2.fedoraproject.org -bvmhost-x86-02.iad2.fedoraproject.org -bvmhost-x86-03.iad2.fedoraproject.org -bvmhost-x86-04.iad2.fedoraproject.org -bvmhost-x86-05.iad2.fedoraproject.org -bvmhost-x86-06.iad2.fedoraproject.org -bvmhost-x86-07.iad2.fedoraproject.org -bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org -bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-05.stg.iad2.fedoraproject.org - [bvirthost_rdu3] bvmhost-x86-01.rdu3.fedoraproject.org bvmhost-x86-02.rdu3.fedoraproject.org @@ -175,12 +97,6 @@ bvmhost-x86-02.stg.rdu3.fedoraproject.org bvmhost-x86-03.stg.rdu3.fedoraproject.org bvmhost-x86-riscv01.rdu3.fedoraproject.org -[bvirthost_stg_iad2] -bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org -bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-05.stg.iad2.fedoraproject.org - [bvirthost_stg_rdu3] bvmhost-x86-01.stg.rdu3.fedoraproject.org bvmhost-x86-02.stg.rdu3.fedoraproject.org @@ -203,104 +119,59 @@ ibiblio02.fedoraproject.org ibiblio05.fedoraproject.org [flatpak_cache] -flatpak-cache01.iad2.fedoraproject.org +flatpak-cache01.rdu3.fedoraproject.org [mailman] -mailman01.iad2.fedoraproject.org mailman01.rdu3.fedoraproject.org -[mailman_iad2] -mailman01.iad2.fedoraproject.org - [mailman_rdu3] mailman01.rdu3.fedoraproject.org [mailman_stg] -mailman01.stg.iad2.fedoraproject.org mailman01.stg.rdu3.fedoraproject.org -[mailman_stg_iad2] -mailman01.stg.iad2.fedoraproject.org - [mailman_stg_rdu3] mailman01.stg.rdu3.fedoraproject.org [bodhi_backend] # This one handles the mashing/releng stuff -bodhi-backend01.iad2.fedoraproject.org bodhi-backend01.rdu3.fedoraproject.org -[bodhi_backend_iad2] -bodhi-backend01.iad2.fedoraproject.org - [bodhi_backend_rdu3] bodhi-backend01.rdu3.fedoraproject.org [bodhi_backend_stg] -bodhi-backend01.stg.iad2.fedoraproject.org - -[bodhi_backend_stg_iad2] -bodhi-backend01.stg.iad2.fedoraproject.org +bodhi-backend01.stg.rdu3.fedoraproject.org [bodhi_backend_stg_rdu3] +bodhi-backend01.stg.rdu3.fedoraproject.org [sign_bridge] -sign-bridge01.iad2.fedoraproject.org -sign-bridge01.stg.iad2.fedoraproject.org sign-bridge01.rdu3.fedoraproject.org -[sign_bridge_iad2] -sign-bridge01.iad2.fedoraproject.org -sign-bridge01.stg.iad2.fedoraproject.org - [sign_bridge_rdu3] sign-bridge01.rdu3.fedoraproject.org -[sign_bridge_stg_iad2] -sign-bridge01.stg.iad2.fedoraproject.org - [sign_bridge_stg_rdu3] # # sign vault servers don't listen to ssh by default. # [sign_vault] -sign-vault01.stg.iad2.fedoraproject.org -sign-vault01.iad2.fedoraproject.org -sign-vault02.iad2.fedoraproject.org sign-vault01.rdu3.fedoraproject.org -[sign_vault_iad2] -sign-vault01.iad2.fedoraproject.org -sign-vault02.iad2.fedoraproject.org - [sign_vault_rdu3] sign-vault01.rdu3.fedoraproject.org [autosign] autosign01.rdu3.fedoraproject.org -autosign02.iad2.fedoraproject.org [autosign_rdu3] autosign01.rdu3.fedoraproject.org -[autosign_iad2] -autosign02.iad2.fedoraproject.org - -[autosign_stg] -autosign01.stg.iad2.fedoraproject.org - -[autosign_stg_iad2] - [autosign_stg_rdu3] [dbserver] -db01.iad2.fedoraproject.org -db03.iad2.fedoraproject.org -db-fas01.iad2.fedoraproject.org -db-datanommer02.iad2.fedoraproject.org -db-koji01.iad2.fedoraproject.org -db-openqa01.iad2.fedoraproject.org db-riscv-koji01.rdu3.fedoraproject.org db-datanommer02.rdu3.fedoraproject.org db-fas01.rdu3.fedoraproject.org @@ -309,14 +180,6 @@ db-openqa01.rdu3.fedoraproject.org db01.rdu3.fedoraproject.org db03.rdu3.fedoraproject.org -[dbserver_iad2] -db01.iad2.fedoraproject.org -db03.iad2.fedoraproject.org -db-fas01.iad2.fedoraproject.org -db-datanommer02.iad2.fedoraproject.org -db-koji01.iad2.fedoraproject.org -db-openqa01.iad2.fedoraproject.org - [dbserver_rdu3] db-datanommer02.rdu3.fedoraproject.org db-fas01.rdu3.fedoraproject.org @@ -327,11 +190,6 @@ db-riscv-koji01.rdu3.fedoraproject.org db-openqa01.rdu3.fedoraproject.org [dbserver_stg] -db-fas01.stg.iad2.fedoraproject.org -db01.stg.iad2.fedoraproject.org -db03.stg.iad2.fedoraproject.org -db-datanommer01.stg.iad2.fedoraproject.org -db-koji01.stg.iad2.fedoraproject.org db.stg.aws.fedoraproject.org db-datanommer01.stg.rdu3.fedoraproject.org db-fas01.stg.rdu3.fedoraproject.org @@ -339,14 +197,6 @@ db-koji01.stg.rdu3.fedoraproject.org db01.stg.rdu3.fedoraproject.org db03.stg.rdu3.fedoraproject.org -[dbserver_stg_iad2] -db-fas01.stg.iad2.fedoraproject.org -db01.stg.iad2.fedoraproject.org -db03.stg.iad2.fedoraproject.org -db-datanommer01.stg.iad2.fedoraproject.org -db-koji01.stg.iad2.fedoraproject.org -db.stg.aws.fedoraproject.org - [dbserver_stg_rdu3] db-datanommer01.stg.rdu3.fedoraproject.org db-fas01.stg.rdu3.fedoraproject.org @@ -355,19 +205,15 @@ 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 [datanommer_dbserver_stg] -db-datanommer01.stg.iad2.fedoraproject.org db-datanommer01.stg.rdu3.fedoraproject.org # clients that talk to the main postgres servers @@ -375,17 +221,9 @@ db-datanommer01.stg.rdu3.fedoraproject.org # clients that talk to the main postgres stg servers [postgres_clients_stg] -bodhi-backend01.stg.iad2.fedoraproject.org -koji01.stg.iad2.fedoraproject.org +bodhi-backend01.stg.rdu3.fedoraproject.org koji01.stg.rdu3.fedoraproject.org -[download_iad2] -dl01.iad2.fedoraproject.org -dl02.iad2.fedoraproject.org -dl03.iad2.fedoraproject.org -dl04.iad2.fedoraproject.org -dl05.iad2.fedoraproject.org - [download_rdu3] dl01.rdu3.fedoraproject.org dl02.rdu3.fedoraproject.org @@ -400,28 +238,21 @@ download-ib01.fedoraproject.org download-cc-rdu01.fedoraproject.org [download_tier1] -dl04.iad2.fedoraproject.org -dl05.iad2.fedoraproject.org +dl04.rdu3.fedoraproject.org +dl05.rdu3.fedoraproject.org [download:children] download_ibiblio download_cc_rdu -download_iad2 download_rdu3 [kernel_qa] -kernel02.iad2.fedoraproject.org +kernel02.rdu3.fedoraproject.org [koji] -koji01.iad2.fedoraproject.org -koji02.iad2.fedoraproject.org koji01.rdu3.fedoraproject.org koji02.rdu3.fedoraproject.org -[koji_iad2] -koji01.iad2.fedoraproject.org -koji02.iad2.fedoraproject.org - [koji_rdu3] koji01.rdu3.fedoraproject.org koji02.rdu3.fedoraproject.org @@ -430,122 +261,74 @@ koji02.rdu3.fedoraproject.org riscv-koji01.rdu3.fedoraproject.org [koji_stg] -koji01.stg.iad2.fedoraproject.org koji01.stg.rdu3.fedoraproject.org -[koji_stg_iad2] -koji01.stg.iad2.fedoraproject.org - [koji_stg_rdu3] koji01.stg.rdu3.fedoraproject.org [kojipkgs] -kojipkgs01.iad2.fedoraproject.org -kojipkgs02.iad2.fedoraproject.org kojipkgs01.rdu3.fedoraproject.org kojipkgs02.rdu3.fedoraproject.org -[kojipkgs_iad2] -kojipkgs01.iad2.fedoraproject.org -kojipkgs02.iad2.fedoraproject.org - [kojipkgs_rdu3] kojipkgs01.rdu3.fedoraproject.org kojipkgs02.rdu3.fedoraproject.org [infracore] -batcave01.iad2.fedoraproject.org -log01.iad2.fedoraproject.org -noc01.iad2.fedoraproject.org +batcave01.rdu3.fedoraproject.org +log01.rdu3.fedoraproject.org +noc01.rdu3.fedoraproject.org noc02.fedoraproject.org noc-cc01.rdu-cc.fedoraproject.org [logging] -log01.iad2.fedoraproject.org log01.rdu3.fedoraproject.org -[logging_iad2] -log01.iad2.fedoraproject.org - [logging_rdu3] log01.rdu3.fedoraproject.org [batcave] -batcave01.iad2.fedoraproject.org batcave01.rdu3.fedoraproject.org -[batcave_iad2] -batcave01.iad2.fedoraproject.org - [batcave_rdu3] batcave01.rdu3.fedoraproject.org [ipa] -ipa01.iad2.fedoraproject.org -ipa02.iad2.fedoraproject.org -ipa03.iad2.fedoraproject.org ipa01.rdu3.fedoraproject.org ipa02.rdu3.fedoraproject.org ipa03.rdu3.fedoraproject.org -[ipa_iad2] -ipa01.iad2.fedoraproject.org -ipa02.iad2.fedoraproject.org -ipa03.iad2.fedoraproject.org - [ipa_rdu3] ipa01.rdu3.fedoraproject.org ipa02.rdu3.fedoraproject.org ipa03.rdu3.fedoraproject.org [ipa_stg] -ipa01.stg.iad2.fedoraproject.org -ipa02.stg.iad2.fedoraproject.org -ipa03.stg.iad2.fedoraproject.org ipa01.stg.rdu3.fedoraproject.org ipa02.stg.rdu3.fedoraproject.org ipa03.stg.rdu3.fedoraproject.org -[ipa_stg_iad2] -ipa01.stg.iad2.fedoraproject.org -ipa02.stg.iad2.fedoraproject.org -ipa03.stg.iad2.fedoraproject.org - [ipa_stg_rdu3] ipa01.stg.rdu3.fedoraproject.org ipa02.stg.rdu3.fedoraproject.org ipa03.stg.rdu3.fedoraproject.org [ipsilon_stg] -ipsilon01.stg.iad2.fedoraproject.org ipsilon01.stg.rdu3.fedoraproject.org -[ipsilon_stg_iad2] -ipsilon01.stg.iad2.fedoraproject.org - [ipsilon_stg_rdu3] ipsilon01.stg.rdu3.fedoraproject.org [ipsilon] -ipsilon01.iad2.fedoraproject.org -ipsilon02.iad2.fedoraproject.org ipsilon01.rdu3.fedoraproject.org -[ipsilon_iad2] -ipsilon01.iad2.fedoraproject.org -ipsilon02.iad2.fedoraproject.org - [ipsilon_rdu3] ipsilon01.rdu3.fedoraproject.org [nagios] -noc01.iad2.fedoraproject.org noc02.fedoraproject.org noc01.rdu3.fedoraproject.org -[nagios_iad2] -noc01.iad2.fedoraproject.org - [nagios_rdu3] noc01.rdu3.fedoraproject.org @@ -553,22 +336,14 @@ noc01.rdu3.fedoraproject.org noc-cc01.rdu-cc.fedoraproject.org [memcached] -memcached02.iad2.fedoraproject.org memcached02.rdu3.fedoraproject.org -[memcached_iad2] -memcached02.iad2.fedoraproject.org - [memcached_rdu3] memcached02.rdu3.fedoraproject.org [memcached_stg] -memcached02.stg.iad2.fedoraproject.org memcached02.stg.rdu3.fedoraproject.org -[memcached_stg_iad2] -memcached02.stg.iad2.fedoraproject.org - [memcached_stg_rdu3] memcached02.stg.rdu3.fedoraproject.org @@ -609,15 +384,9 @@ people01.fedoraproject.org [qahardware] [tang] -tang01.iad2.fedoraproject.org -tang02.iad2.fedoraproject.org tang01.rdu3.fedoraproject.org tang02.rdu3.fedoraproject.org -[tang_iad2] -tang01.iad2.fedoraproject.org -tang02.iad2.fedoraproject.org - [tang_rdu3] tang01.rdu3.fedoraproject.org tang02.rdu3.fedoraproject.org @@ -626,12 +395,8 @@ tang02.rdu3.fedoraproject.org torrent01.fedoraproject.org [secondary] -secondary01.iad2.fedoraproject.org secondary01.rdu3.fedoraproject.org -[secondary_iad2] -secondary01.iad2.fedoraproject.org - [secondary_rdu3] secondary01.rdu3.fedoraproject.org @@ -641,10 +406,6 @@ ns05.fedoraproject.org ns01.rdu3.fedoraproject.org ns02.rdu3.fedoraproject.org -[dns_iad2] -ns01.iad2.fedoraproject.org -ns02.iad2.fedoraproject.org - [dns_rdu3] ns01.rdu3.fedoraproject.org ns02.rdu3.fedoraproject.org @@ -717,27 +478,18 @@ openqa_tap2_workers openqa_tap12_workers [pkgs] -pkgs01.iad2.fedoraproject.org pkgs01.rdu3.fedoraproject.org -[pkgs_iad2] -pkgs01.iad2.fedoraproject.org - [pkgs_rdu3] pkgs01.rdu3.fedoraproject.org [pkgs_stg] -pkgs01.stg.iad2.fedoraproject.org pkgs01.stg.rdu3.fedoraproject.org -[pkgs_stg_iad2] -pkgs01.stg.iad2.fedoraproject.org - [pkgs_stg_rdu3] pkgs01.stg.rdu3.fedoraproject.org [proxies_external] -proxy01.iad2.fedoraproject.org proxy01.rdu3.fedoraproject.org proxy02.fedoraproject.org proxy03.fedoraproject.org @@ -747,7 +499,6 @@ proxy06.fedoraproject.org #proxy07.fedoraproject.org #proxy08.fedoraproject.org proxy09.fedoraproject.org -proxy10.iad2.fedoraproject.org proxy10.rdu3.fedoraproject.org proxy11.fedoraproject.org proxy12.fedoraproject.org @@ -766,23 +517,13 @@ proxy39.fedoraproject.org proxy40.fedoraproject.org [proxies_internal] -proxy101.iad2.fedoraproject.org -proxy110.iad2.fedoraproject.org proxy101.rdu3.fedoraproject.org proxy110.rdu3.fedoraproject.org [proxies_ocp4] -proxy01.iad2.fedoraproject.org -proxy10.iad2.fedoraproject.org proxy01.rdu3.fedoraproject.org proxy10.rdu3.fedoraproject.org -[proxies_iad2] -proxy01.iad2.fedoraproject.org -proxy10.iad2.fedoraproject.org -proxy101.iad2.fedoraproject.org -proxy110.iad2.fedoraproject.org - [proxies_rdu3] proxy01.rdu3.fedoraproject.org proxy10.rdu3.fedoraproject.org @@ -796,12 +537,6 @@ proxies_internal [proxies_stg] proxy01.stg.rdu3.fedoraproject.org proxy02.stg.rdu3.fedoraproject.org -proxy01.stg.iad2.fedoraproject.org -proxy02.stg.iad2.fedoraproject.org - -[proxies_stg_iad2] -proxy01.stg.iad2.fedoraproject.org -proxy02.stg.iad2.fedoraproject.org [proxies_stg_rdu3] proxy01.stg.rdu3.fedoraproject.org @@ -844,22 +579,14 @@ smtp-mm-cc-rdu01.fedoraproject.org smtp-auth-cc-rdu01.fedoraproject.org [zabbix] -zabbix01.iad2.fedoraproject.org zabbix01.rdu3.fedoraproject.org -[zabbix_iad2] -zabbix01.iad2.fedoraproject.org - [zabbix_rdu3] zabbix01.rdu3.fedoraproject.org [zabbix_stg] -zabbix01.stg.iad2.fedoraproject.org zabbix01.stg.rdu3.fedoraproject.org -[zabbix_stg_iad2] -zabbix01.stg.iad2.fedoraproject.org - [zabbix_stg_rdu3] zabbix01.stg.rdu3.fedoraproject.org @@ -868,34 +595,12 @@ zabbix01.stg.rdu3.fedoraproject.org # All staging hosts should be in this group too. # [staging] -autosign01.stg.iad2.fedoraproject.org -# basset01.stg.iad2.fedoraproject.org -bodhi-backend01.stg.iad2.fedoraproject.org -bvmhost-x86-01.stg.iad2.fedoraproject.org -bvmhost-x86-02.stg.iad2.fedoraproject.org -bvmhost-x86-03.stg.iad2.fedoraproject.org -bvmhost-x86-05.stg.iad2.fedoraproject.org -bvmhost-p09-01.stg.iad2.fedoraproject.org bvmhost-s390x-01.stg.s390.fedoraproject.org -bvmhost-a64-01.stg.iad2.fedoraproject.org bvmhost-a64-01.stg.rdu3.fedoraproject.org bvmhost-x86-01.stg.rdu3.fedoraproject.org bvmhost-x86-02.stg.rdu3.fedoraproject.org bvmhost-x86-03.stg.rdu3.fedoraproject.org -buildvm-a64-01.stg.iad2.fedoraproject.org -buildvm-a64-02.stg.iad2.fedoraproject.org -buildvm-ppc64le-01.stg.iad2.fedoraproject.org -buildvm-ppc64le-02.stg.iad2.fedoraproject.org -buildvm-ppc64le-03.stg.iad2.fedoraproject.org -buildvm-ppc64le-04.stg.iad2.fedoraproject.org -buildvm-ppc64le-05.stg.iad2.fedoraproject.org buildvm-s390x-01.stg.s390.fedoraproject.org -buildvm-x86-01.stg.iad2.fedoraproject.org -buildvm-x86-02.stg.iad2.fedoraproject.org -buildvm-x86-03.stg.iad2.fedoraproject.org -buildvm-x86-04.stg.iad2.fedoraproject.org -buildvm-x86-05.stg.iad2.fedoraproject.org -compose-x86-01.stg.iad2.fedoraproject.org compose-x86-01.stg.rdu3.fedoraproject.org copr-be-dev.aws.fedoraproject.org #copr-be-dev-temp.aws.fedoraproject.org @@ -903,187 +608,92 @@ copr-dist-git-dev.aws.fedoraproject.org copr-fe-dev.aws.fedoraproject.org copr-keygen-dev.aws.fedoraproject.org copr-pulp-dev.aws.fedoraproject.org -db-datanommer01.stg.iad2.fedoraproject.org -db-fas01.stg.iad2.fedoraproject.org -db-koji01.stg.iad2.fedoraproject.org -db01.stg.iad2.fedoraproject.org -db03.stg.iad2.fedoraproject.org db-datanommer01.stg.rdu3.fedoraproject.org db-fas01.stg.rdu3.fedoraproject.org db-koji01.stg.rdu3.fedoraproject.org db01.stg.rdu3.fedoraproject.org db03.stg.rdu3.fedoraproject.org db.stg.aws.fedoraproject.org -debuginfod01.stg.iad2.fedoraproject.org -oci-candidate-registry01.stg.iad2.fedoraproject.org -oci-registry01.stg.iad2.fedoraproject.org oci-candidate-registry01.stg.rdu3.fedoraproject.org oci-registry01.stg.rdu3.fedoraproject.org -ipa01.stg.iad2.fedoraproject.org -ipa02.stg.iad2.fedoraproject.org -ipa03.stg.iad2.fedoraproject.org ipa01.stg.rdu3.fedoraproject.org ipa02.stg.rdu3.fedoraproject.org ipa03.stg.rdu3.fedoraproject.org -ipsilon01.stg.iad2.fedoraproject.org ipsilon01.stg.rdu3.fedoraproject.org -koji01.stg.iad2.fedoraproject.org koji01.stg.rdu3.fedoraproject.org -mailman01.stg.iad2.fedoraproject.org -memcached02.stg.iad2.fedoraproject.org -os-control01.stg.iad2.fedoraproject.org os-control01.stg.rdu3.fedoraproject.org -pkgs01.stg.iad2.fedoraproject.org pkgs01.stg.rdu3.fedoraproject.org -proxy01.stg.iad2.fedoraproject.org -proxy02.stg.iad2.fedoraproject.org proxy01.stg.rdu3.fedoraproject.org proxy02.stg.rdu3.fedoraproject.org -rabbitmq01.stg.iad2.fedoraproject.org -rabbitmq02.stg.iad2.fedoraproject.org -rabbitmq03.stg.iad2.fedoraproject.org rabbitmq01.stg.rdu3.fedoraproject.org rabbitmq02.stg.rdu3.fedoraproject.org rabbitmq03.stg.rdu3.fedoraproject.org -sign-bridge01.stg.iad2.fedoraproject.org -sign-vault01.stg.iad2.fedoraproject.org -sundries01.stg.iad2.fedoraproject.org -sundries02.stg.iad2.fedoraproject.org sundries01.stg.rdu3.fedoraproject.org sundries02.stg.rdu3.fedoraproject.org -value02.stg.iad2.fedoraproject.org value01.stg.rdu3.fedoraproject.org -vmhost-x86-01.stg.iad2.fedoraproject.org -vmhost-x86-02.stg.iad2.fedoraproject.org -vmhost-x86-05.stg.iad2.fedoraproject.org -vmhost-x86-06.stg.iad2.fedoraproject.org -vmhost-x86-07.stg.iad2.fedoraproject.org -vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-11.stg.iad2.fedoraproject.org -vmhost-x86-12.stg.iad2.fedoraproject.org vmhost-x86-01.stg.rdu3.fedoraproject.org vmhost-x86-02.stg.rdu3.fedoraproject.org vmhost-x86-03.stg.rdu3.fedoraproject.org vmhost-x86-04.stg.rdu3.fedoraproject.org vmhost-x86-05.stg.rdu3.fedoraproject.org -wiki01.stg.iad2.fedoraproject.org wiki01.stg.rdu3.fedoraproject.org -zabbix01.stg.iad2.fedoraproject.org # This is a list of hosts that are a little "friendly" with staging. # They are exempted from the iptables wall between staging and prod. # For instance, staging needs to send collectd logs to log01 and smtp mail data # to bastion (both of which are prod boxen). [staging_friendly] -noc01.iad2.fedoraproject.org -bastion01.iad2.fedoraproject.org +noc01.rdu3.fedoraproject.org bastion01.rdu3.fedoraproject.org -bastion02.iad2.fedoraproject.org bastion02.rdu3.fedoraproject.org -batcave01.iad2.fedoraproject.org batcave01.rdu3.fedoraproject.org -certgetter01.iad2.fedoraproject.org certgetter01.rdu3.fedoraproject.org -db-openqa01.iad2.fedoraproject.org db-openqa01.rdu3.fedoraproject.org -dl01.iad2.fedoraproject.org -dl02.iad2.fedoraproject.org -dl03.iad2.fedoraproject.org -dl04.iad2.fedoraproject.org -dl05.iad2.fedoraproject.org dl01.rdu3.fedoraproject.org dl02.rdu3.fedoraproject.org dl03.rdu3.fedoraproject.org dl04.rdu3.fedoraproject.org dl05.rdu3.fedoraproject.org -log01.iad2.fedoraproject.org log01.rdu3.fedoraproject.org -ns01.iad2.fedoraproject.org -ns02.iad2.fedoraproject.org openqa-lab01.rdu3.fedoraproject.org -proxy01.iad2.fedoraproject.org proxy01.rdu3.fedoraproject.org -proxy101.iad2.fedoraproject.org proxy101.rdu3.fedoraproject.org -proxy10.iad2.fedoraproject.org proxy10.rdu3.fedoraproject.org -proxy110.iad2.fedoraproject.org proxy110.rdu3.fedoraproject.org -tang01.iad2.fedoraproject.org -tang02.iad2.fedoraproject.org tang01.rdu3.fedoraproject.org tang02.rdu3.fedoraproject.org ns01.rdu3.fedoraproject.org ns02.rdu3.fedoraproject.org [sundries] -sundries01.iad2.fedoraproject.org -sundries02.iad2.fedoraproject.org sundries01.rdu3.fedoraproject.org sundries02.rdu3.fedoraproject.org -[sundries_iad2] -sundries01.iad2.fedoraproject.org -sundries02.iad2.fedoraproject.org - [sundries_rdu3] sundries01.rdu3.fedoraproject.org sundries02.rdu3.fedoraproject.org [sundries_stg] -sundries01.stg.iad2.fedoraproject.org -sundries02.stg.iad2.fedoraproject.org sundries01.stg.rdu3.fedoraproject.org sundries02.stg.rdu3.fedoraproject.org -[sundries_stg_iad2] -sundries01.stg.iad2.fedoraproject.org -sundries02.stg.iad2.fedoraproject.org - [sundries_stg_rdu3] sundries01.stg.rdu3.fedoraproject.org sundries02.stg.rdu3.fedoraproject.org [value] -value02.iad2.fedoraproject.org value01.rdu3.fedoraproject.org -[value_iad2] -value02.iad2.fedoraproject.org - [value_rdu3] value01.rdu3.fedoraproject.org [value_stg] -value02.stg.iad2.fedoraproject.org value01.stg.rdu3.fedoraproject.org -[value_stg_iad2] -value02.stg.iad2.fedoraproject.org - [value_stg_rdu3] value01.stg.rdu3.fedoraproject.org [virthost] -vmhost-x86-01.stg.iad2.fedoraproject.org -vmhost-x86-02.stg.iad2.fedoraproject.org -vmhost-x86-05.stg.iad2.fedoraproject.org -vmhost-x86-06.stg.iad2.fedoraproject.org -vmhost-x86-07.stg.iad2.fedoraproject.org -vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-11.stg.iad2.fedoraproject.org -vmhost-x86-12.stg.iad2.fedoraproject.org -vmhost-x86-01.iad2.fedoraproject.org -vmhost-x86-02.iad2.fedoraproject.org -vmhost-x86-03.iad2.fedoraproject.org -vmhost-x86-04.iad2.fedoraproject.org -vmhost-x86-05.iad2.fedoraproject.org -vmhost-x86-06.iad2.fedoraproject.org -vmhost-x86-08.iad2.fedoraproject.org -qvmhost-x86-01.iad2.fedoraproject.org -qvmhost-x86-02.iad2.fedoraproject.org vmhost-x86-01.rdu3.fedoraproject.org vmhost-x86-02.rdu3.fedoraproject.org vmhost-x86-03.rdu3.fedoraproject.org @@ -1096,28 +706,6 @@ vmhost-x86-04.stg.rdu3.fedoraproject.org vmhost-x86-05.stg.rdu3.fedoraproject.org qvmhost-x86-01.rdu3.fedoraproject.org -[virthost_iad2] -vmhost-x86-01.iad2.fedoraproject.org -vmhost-x86-02.iad2.fedoraproject.org -vmhost-x86-03.iad2.fedoraproject.org -vmhost-x86-04.iad2.fedoraproject.org -vmhost-x86-05.iad2.fedoraproject.org -vmhost-x86-06.iad2.fedoraproject.org -vmhost-x86-08.iad2.fedoraproject.org -qvmhost-x86-01.iad2.fedoraproject.org -qvmhost-x86-02.iad2.fedoraproject.org - -[virthost_stg_iad2] -vmhost-x86-01.stg.iad2.fedoraproject.org -vmhost-x86-02.stg.iad2.fedoraproject.org -vmhost-x86-05.stg.iad2.fedoraproject.org -vmhost-x86-06.stg.iad2.fedoraproject.org -vmhost-x86-07.stg.iad2.fedoraproject.org -vmhost-x86-08.stg.iad2.fedoraproject.org -vmhost-x86-09.stg.iad2.fedoraproject.org -vmhost-x86-11.stg.iad2.fedoraproject.org -vmhost-x86-12.stg.iad2.fedoraproject.org - [virthost_rdu3] vmhost-x86-01.rdu3.fedoraproject.org vmhost-x86-02.rdu3.fedoraproject.org @@ -1134,25 +722,15 @@ vmhost-x86-04.stg.rdu3.fedoraproject.org vmhost-x86-05.stg.rdu3.fedoraproject.org [wiki_stg] -wiki01.stg.iad2.fedoraproject.org wiki01.stg.rdu3.fedoraproject.org -[wiki_stg_iad2] -wiki01.stg.iad2.fedoraproject.org - [wiki_stg_rdu3] wiki01.stg.rdu3.fedoraproject.org [wiki] -wiki01.iad2.fedoraproject.org -wiki02.iad2.fedoraproject.org wiki01.rdu3.fedoraproject.org wiki02.rdu3.fedoraproject.org -[wiki_iad2] -wiki01.iad2.fedoraproject.org -wiki02.iad2.fedoraproject.org - [wiki_rdu3] wiki01.rdu3.fedoraproject.org wiki02.rdu3.fedoraproject.org @@ -1182,7 +760,6 @@ koji dbserver [groupa] -secondary01.iad2.fedoraproject.org secondary01.rdu3.fedoraproject.org @@ -1282,22 +859,14 @@ vmhost-p09-copr01.rdu-cc.fedoraproject.org db.stg.aws.fedoraproject.org [debuginfod] -debuginfod01.iad2.fedoraproject.org debuginfod01.rdu3.fedoraproject.org -[debuginfod_iad2] -debuginfod01.iad2.fedoraproject.org - [debuginfod_rdu3] debuginfod01.rdu3.fedoraproject.org [debuginfod_stg] -debuginfod01.stg.iad2.fedoraproject.org debuginfod01.stg.rdu3.fedoraproject.org -[debuginfod_stg_iad2] -debuginfod01.stg.iad2.fedoraproject.org - [debuginfod_stg_rdu3] debuginfod01.stg.rdu3.fedoraproject.org @@ -1318,20 +887,17 @@ ocp_workers ocp_controlplane [ocp_controlplane] -#ocp01.ocp.iad2.fedoraproject.org -#ocp02.ocp.iad2.fedoraproject.org -#ocp03.ocp.iad2.fedoraproject.org #ocp01.ocp.rdu3.fedoraproject.org #ocp02.ocp.rdu3.fedoraproject.org #ocp03.ocp.rdu3.fedoraproject.org [ocp_workers] -worker01.ocp.iad2.fedoraproject.org -worker02.ocp.iad2.fedoraproject.org -worker03.ocp.iad2.fedoraproject.org -worker04.ocp.iad2.fedoraproject.org -worker05.ocp.iad2.fedoraproject.org -worker06.ocp.iad2.fedoraproject.org +worker01.ocp.rdu3.fedoraproject.org +worker02.ocp.rdu3.fedoraproject.org +worker03.ocp.rdu3.fedoraproject.org +worker04.ocp.rdu3.fedoraproject.org +worker05.ocp.rdu3.fedoraproject.org +worker06.ocp.rdu3.fedoraproject.org #[ocp_boostrap] #bootstrap.ocp.rdu3.fedoraproject.org @@ -1347,19 +913,16 @@ ocp_boostrap_stg ocp_controlplane_stg [ocp_controlplane_stg] -ocp01.ocp.stg.iad2.fedoraproject.org -ocp02.ocp.stg.iad2.fedoraproject.org -ocp03.ocp.stg.iad2.fedoraproject.org ocp01.ocp.stg.rdu3.fedoraproject.org ocp02.ocp.stg.rdu3.fedoraproject.org ocp03.ocp.stg.rdu3.fedoraproject.org [ocp_workers_stg] -worker01.ocp.stg.iad2.fedoraproject.org -worker02.ocp.stg.iad2.fedoraproject.org -worker03.ocp.stg.iad2.fedoraproject.org -worker04.ocp.stg.iad2.fedoraproject.org -worker05.ocp.stg.iad2.fedoraproject.org +worker01.ocp.stg.rdu3.fedoraproject.org +worker02.ocp.stg.rdu3.fedoraproject.org +worker03.ocp.stg.rdu3.fedoraproject.org +worker04.ocp.stg.rdu3.fedoraproject.org +worker05.ocp.stg.rdu3.fedoraproject.org [ocp_boostrap_stg] #bootstrap.ocp.stg.rdu3.fedoraproject.org @@ -1367,63 +930,42 @@ worker05.ocp.stg.iad2.fedoraproject.org [os_control_stg] os-control01.stg.rdu3.fedoraproject.org -[os_control_stg_iad2] -os-control01.stg.iad2.fedoraproject.org - [os_control_stg_rdu3] os-control01.stg.rdu3.fedoraproject.org [os_control] os-control01.rdu3.fedoraproject.org -[os_control_iad2] -os-control01.iad2.fedoraproject.org - [os_control_rdu3] os-control01.rdu3.fedoraproject.org # registries [oci_registry] -oci-registry01.iad2.fedoraproject.org -oci-registry02.iad2.fedoraproject.org -oci-candidate-registry01.iad2.fedoraproject.org oci-registry01.rdu3.fedoraproject.org oci-registry02.rdu3.fedoraproject.org oci-candidate-registry01.rdu3.fedoraproject.org -[oci_registry_iad2] -oci-registry01.iad2.fedoraproject.org -oci-registry02.iad2.fedoraproject.org -oci-candidate-registry01.iad2.fedoraproject.org - [oci_registry_rdu3] oci-registry01.rdu3.fedoraproject.org oci-registry02.rdu3.fedoraproject.org oci-candidate-registry01.rdu3.fedoraproject.org [oci_registry_stg] -oci-registry01.stg.iad2.fedoraproject.org -oci-candidate-registry01.stg.iad2.fedoraproject.org oci-registry01.stg.rdu3.fedoraproject.org oci-candidate-registry01.stg.rdu3.fedoraproject.org -[oci_registry_stg_iad2] -oci-registry01.stg.iad2.fedoraproject.org -oci-candidate-registry01.stg.iad2.fedoraproject.org - [oci_registry_stg_rdu3] oci-registry01.stg.rdu3.fedoraproject.org oci-candidate-registry01.stg.rdu3.fedoraproject.org ## Not the candidate just the top registry [moby_registry] -oci-registry01.iad2.fedoraproject.org oci-registry01.rdu3.fedoraproject.org ## Not the candidate just the top registry [moby_registry_stg] -oci-registry01.stg.iad2.fedoraproject.org -oci-registry01.stg.iad2.fedoraproject.org +oci-registry01.stg.rdu3.fedoraproject.org +oci-registry01.stg.rdu3.fedoraproject.org [webservers:children] proxies @@ -1437,20 +979,18 @@ ipa [zombie_infested] # anon git via systemd socket seems to get zombies from time to time # Ansible from time to time in large runs has zombie threads -pkgs01.iad2.fedoraproject.org -batcave01.iad2.fedoraproject.org +pkgs01.rdu3.fedoraproject.org +batcave01.rdu3.fedoraproject.org # bodhi-backend01 gets zombies right at the end of pushes -bodhi-backend01.iad2.fedoraproject.org +bodhi-backend01.rdu3.fedoraproject.org [sar] -bodhi-backend01.iad2.fedoraproject.org bodhi-backend01.rdu3.fedoraproject.org -mailman01.iad2.fedoraproject.org mailman01.rdu3.fedoraproject.org people01.fedoraproject.org pagure02.fedoraproject.org -pkgs01.iad2.fedoraproject.org -#wiki01.iad2.fedoraproject.org +pkgs01.rdu3.fedoraproject.org +#wiki01.rdu3.fedoraproject.org [nfs_servers] storinator01.rdu-cc.fedoraproject.org @@ -1465,76 +1005,6 @@ cloud_aws buildvm_s390x_stg bvmhost_s390x -[iad2:children] -iad2_production -iad2_staging - -[iad2_production:children] -backup_iad2 -bastion_iad2 -batcave_iad2 -bodhi_backend_iad2 -buildhw_iad2 -buildvm_iad2 -buildvm_aarch64_iad2 -buildvm_ppc64le_iad2 -buildvmhost_iad2 -bkernel -bvirthost_iad2 -certgetter_iad2 -dbserver_iad2 -debuginfod_iad2 -dns_iad2 -download_iad2 -flatpak_cache -ipa_iad2 -ipsilon_iad2 -koji_iad2 -kojipkgs_iad2 -logging_iad2 -mailman_iad2 -memcached_iad2 -nagios_iad2 -oci_registry_iad2 -os_control_iad2 -pkgs_iad2 -proxies_iad2 -qahardware -rabbitmq_iad2 -releng_compose_iad2 -releng_compose_eln_iad2 -secondary_iad2 -sundries_iad2 -tang_iad2 -value_iad2 -virthost_iad2 -wiki_iad2 - -[iad2_staging:children] -bodhi_backend_stg_iad2 -buildvm_stg_iad2 -buildvm_ppc64le_stg_iad2 -buildvm_aarch64_stg_iad2 -buildvmhost_stg_iad2 -bvirthost_stg_iad2 -dbserver_stg_iad2 -debuginfod_stg_iad2 -ipa_stg_iad2 -ipsilon_stg_iad2 -koji_stg_iad2 -memcached_stg_iad2 -oci_registry_stg_iad2 -os_control_stg_iad2 -pkgs_stg_iad2 -proxies_stg_iad2 -rabbitmq_stg_iad2 -releng_compose_stg_iad2 -sundries_stg_iad2 -value_stg_iad2 -virthost_stg_iad2 -wiki_stg_iad2 -zabbix_stg_iad2 - [rdu3:children] rdu3_production rdu3_staging diff --git a/inventory/zzz-inventory.config b/inventory/zzz-inventory.config index bc661631da..4959088ead 100644 --- a/inventory/zzz-inventory.config +++ b/inventory/zzz-inventory.config @@ -2,9 +2,9 @@ plugin: constructed strict: False compose: groups: - iad2: ('iad2.fedoraproject.org' in ansible_domain) - iad2_guests: ('iad2.fedoraproject.org' in ansible_domain and 'guest' in ansible_virtualization_role) - iad2_hosts: ('iad2.fedoraproject.org' in ansible_domain and 'host' in ansible_virtualization_role) + rdu3: ('rdu3.fedoraproject.org' in ansible_domain) + rdu3_guests: ('rdu3.fedoraproject.org' in ansible_domain and 'guest' in ansible_virtualization_role) + rdu3_hosts: ('rdu3.fedoraproject.org' in ansible_domain and 'host' in ansible_virtualization_role) keyed_groups: - prefix: distro key: ansible_distribution diff --git a/playbooks/destroy_virt_inst.yml b/playbooks/destroy_virt_inst.yml index 0cd6de5dc2..cea33b49ed 100644 --- a/playbooks/destroy_virt_inst.yml +++ b/playbooks/destroy_virt_inst.yml @@ -27,7 +27,7 @@ - name: Schedule 30m host downtime in nagios nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true - name: Pause for 30s before doing it diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index ce70832f15..a2d4b86933 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -27,8 +27,8 @@ mnt_dir: '/fedora_backups', nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3", nfs_src_dir: 'fedora_backups' } - - {role: grokmirror_mirror, when: datacenter == 'iad2'} - - {role: weblate-backup, when: datacenter == 'iad2'} + - role: grokmirror_mirror + - role: weblate-backup - {role: linux-system-roles.nbde_client, tags: ['nbde_client']} - serial-console diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 383b126603..9f7bc8bc45 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -51,10 +51,10 @@ warning: 10 critical: 100 user_sent_topics: ^$ - when: datacenter != 'iad2' + when: datacenter != 'rdu3' - batcave - role: grobisplitter - when: datacenter == 'iad2' + when: datacenter == 'rdu3' - { role: nfs/client, when: inventory_hostname.startswith('batcave'), mnt_dir: '/srv/web/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: inventory_hostname.startswith('batcave01'), mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } - { role: mirror_pagure_ansible, tags: ['mirror_pagure_ansible'] } diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index f086fdea8b..b69a8e7ac1 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -21,7 +21,7 @@ - rkhunter - nagios_client - { role: openvpn/client, - when: datacenter != 'iad2' and datacenter != 'rdu3' } + when: datacenter != 'rdu3' } - ipa/client - collectd/base - collectd/bind diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 5d182ab4d1..7692d99309 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -1,7 +1,7 @@ --- - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml" vars: - myhosts: "download_ibiblio:download_cc_rdu:download_iad2:download_rdu3" + myhosts: "download_ibiblio:download_cc_rdu:download_rdu3" - name: Download servers hosts: download @@ -40,9 +40,9 @@ - apache - download - rsyncd - - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu" or datacenter == "rdu3" , mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu" or datacenter == "rdu3" , mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive' } - - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu3" , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } # needed for internal sync + - { role: nfs/client, when: datacenter == "rdu" or datacenter == "rdu3" , mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } + - { role: nfs/client, when: datacenter == "rdu" or datacenter == "rdu3" , mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive' } + - { role: nfs/client, when: datacenter == "rdu3" , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } # needed for internal sync - sudo pre_tasks: @@ -84,7 +84,7 @@ - name: Make a mnt/koji link ansible.builtin.file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji - when: datacenter == "iad2" or datacenter == "rdu3" + when: datacenter == "rdu3" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 708c3ef6b3..33f863a0e3 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -58,7 +58,7 @@ # This next block configures IPA, it only needs to be run on one member of the cluster. # Run it after setting up Ipsilon because the host need to be declared in IPA already. - name: Setup IPA - hosts: ipa_iad2[0]:ipa_rdu3[0]:ipa_stg_iad2[0]:ipa_stg_rdu3[0] + hosts: ipa_rdu3[0]:ipa_stg_rdu3[0] user: root gather_facts: true @@ -92,7 +92,7 @@ ipahbacrule: name: ipsilon action: member - host: "{{ (env == 'production')|ternary(['ipsilon.iad2.centos.org', 'ipsilon.rdu3.centos.org'], ['ipsilon.stg.iad2.centos.org', 'ipsilon.stg.rdu3.centos.org']) }}" + host: "{{ (env == 'production')|ternary(['ipsilon.rdu3.centos.org'], ['ipsilon.stg.rdu3.centos.org']) }}" ipaadmin_password: "{{ ipa_admin_password }}" tags: - ipsilon diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 8107ec363b..d2c6eefa70 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -159,7 +159,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Configure sshfs target on koji01 - hosts: koji01.iad2.fedoraproject.org:koji01.stg.iad2.fedoraproject.org:koji01.rdu3.fedoraproject.org:koji01.stg.rdu3.fedoraproject.org + hosts: koji01.rdu3.fedoraproject.org:koji01.stg.rdu3.fedoraproject.org tags: - sshfs user: root diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 1bcb6408ab..56f5d97891 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -55,7 +55,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Cloud Image stats - hosts: log01.iad2.fedoraproject.org + hosts: log01.rdu3.fedoraproject.org user: root gather_facts: false @@ -71,7 +71,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Dole out the service-specific config - hosts: log01.iad2.fedoraproject.org:log01.rdu3.fedoraproject.org + hosts: log01.rdu3.fedoraproject.org user: root gather_facts: true vars_files: diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 8a0e6ffafa..0c1b0cd9a9 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -42,7 +42,7 @@ # - name: Prepare setting up the database - hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db01.rdu3.fedoraproject.org:db01.stg.rdu3.fedoraproject.org + hosts: db01.rdu3.fedoraproject.org:db01.stg.rdu3.fedoraproject.org gather_facts: no user: root @@ -53,7 +53,7 @@ - packages - name: Setup the database - hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db01.rdu3.fedoraproject.org:db01.stg.rdu3.fedoraproject.org + hosts: db01.rdu3.fedoraproject.org:db01.stg.rdu3.fedoraproject.org gather_facts: no become: yes become_user: postgres diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index ca716b7d20..c9a439ad71 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -6,18 +6,14 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml" vars: # See: https://yaml-multiline.info/ - myhosts: "db03.stg.iad2.fedoraproject.org: - db03.rdu3.fedoraproject.org: - db03.stg.rdu3.fedoraproject.org: - db03.iad2.fedoraproject.org" + myhosts: "db03.rdu3.fedoraproject.org: + db03.stg.rdu3.fedoraproject.org" # Once the instance exists, configure it. - name: Configure mariadb server system - hosts: "db03.stg.iad2.fedoraproject.org: - db03.rdu3.fedoraproject.org: - db03.stg.rdu3.fedoraproject.org: - db03.iad2.fedoraproject.org" + hosts: "db03.rdu3.fedoraproject.org: + db03.stg.rdu3.fedoraproject.org" user: root gather_facts: true diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index c261e9c95a..c43511d36f 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -25,7 +25,7 @@ - { role: openvpn/client, when: env != "staging" } - ipa/client - collectd/base - - { role: rsyncd, when: datacenter == 'iad2' or datacenter == 'rdu3' } + - { role: rsyncd, when: datacenter == 'rdu3' } - sudo - apache # - mod_wsgi @@ -34,7 +34,7 @@ owner_group: apache service: HTTP host: "nagios{{env_suffix}}.fedoraproject.org" - when: datacenter == 'iad2' or datacenter == 'rdu3' + when: datacenter == 'rdu3' - role: keytab/service owner_user: apache owner_group: apache @@ -60,9 +60,9 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - - { role: dhcp_server, when: datacenter == 'iad2' or datacenter == 'rdu3' } - - { role: tftp_server, when: datacenter == 'iad2' or datacenter == 'rdu3' } - - { role: nagios_server, when: datacenter == 'iad2' or datacenter == 'ibiblio' or datacenter == 'rdu3' } + - { role: dhcp_server, when: datacenter == 'rdu3' } + - { role: tftp_server, when: datacenter == 'rdu3' } + - { role: nagios_server, when: datacenter == 'ibiblio' or datacenter == 'rdu3' } tasks: - name: Install some packages which arent in playbooks diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 83b282f421..eabd9ba15d 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -6,16 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml" vars: # See: https://yaml-multiline.info/ - myhosts: "db-fas01.stg.iad2.fedoraproject.org: - db01.stg.iad2.fedoraproject.org: - db-koji01.stg.iad2.fedoraproject.org: - db-fas01.iad2.fedoraproject.org: - db01.iad2.fedoraproject.org: - db-koji01.iad2.fedoraproject.org: - db-openqa01.iad2.fedoraproject.org: - db-openqa01.rdu3.fedoraproject.org: - db-datanommer01.stg.iad2.fedoraproject.org: - db-datanommer02.iad2.fedoraproject.org: + myhosts: "db-openqa01.rdu3.fedoraproject.org: db-datanommer02.rdu3.fedoraproject.org: db-fas01.rdu3.fedoraproject.org: db-koji01.rdu3.fedoraproject.org: @@ -29,16 +20,7 @@ # Once the instance exists, configure it. - name: Configure postgresql server system - hosts: "db-fas01.stg.iad2.fedoraproject.org: - db01.stg.iad2.fedoraproject.org: - db-koji01.stg.iad2.fedoraproject.org: - db-fas01.iad2.fedoraproject.org: - db01.iad2.fedoraproject.org: - db-koji01.iad2.fedoraproject.org: - db-openqa01.iad2.fedoraproject.org: - db-openqa01.rdu3.fedoraproject.org: - db-datanommer01.stg.iad2.fedoraproject.org: - db-datanommer02.iad2.fedoraproject.org: + hosts: "db-openqa01.rdu3.fedoraproject.org: db-datanommer02.rdu3.fedoraproject.org: db-fas01.rdu3.fedoraproject.org: db-koji01.rdu3.fedoraproject.org: diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml index fa8bfc7ded..46b2e7384e 100644 --- a/playbooks/groups/rabbitmq.yml +++ b/playbooks/groups/rabbitmq.yml @@ -22,10 +22,10 @@ - nagios_client - role: zabbix/zabbix_agent # Zabbix is not deployed in staging RDU3 yet - when: datacenter == "iad2" or env == "production" + when: env == "production" - role: zabbix/zabbix_templates # Zabbix is not deployed in staging RDU3 yet - when: datacenter == "iad2" or env == "production" + when: env == "production" - hosts - ipa/client - collectd/base diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 9a0042c4aa..acce7b5126 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -42,7 +42,7 @@ - sudo - role: keytab/service service: compose - host: "compose-x86-01.stg.iad2.fedoraproject.org" + host: "compose-x86-01.stg.rdu3.fedoraproject.org" when: env == "staging" - role: keytab/service service: compose diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index be6f691e26..c5aeae44fd 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -46,11 +46,10 @@ - {role: openvpn/client, when: vpn|bool} - ipa/client - role: collectd/base - - {role: iscsi_client, when: "inventory_hostname.startswith(('bvmhost-x86-06', 'bvmhost-x86-07', 'bvmhost-p09')) and datacenter == 'iad2'"} - sudo - virthost - - {role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: (datacenter == 'iad2' and nbde|bool) or ( datacenter == 'rdu3' and nbde|bool) } - - {role: serial-console, when: datacenter == 'iad2' and ansible_architecture != 's390x'} + - {role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: (datacenter == 'rdu3' and nbde|bool) or ( datacenter == 'rdu3' and nbde|bool) } + - {role: serial-console, when: datacenter == 'rdu3' and ansible_architecture != 's390x'} handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/host_reboot.yml b/playbooks/host_reboot.yml index c51a81a899..5aaa0dcdd2 100644 --- a/playbooks/host_reboot.yml +++ b/playbooks/host_reboot.yml @@ -10,7 +10,7 @@ tasks: - name: Tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true - name: Reboot the host @@ -18,5 +18,5 @@ - name: Tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 416d94ee9e..095fb76987 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -1138,20 +1138,20 @@ ssl: true sslonly: true certbot: true - certbot_addhost: pkgs01.iad2.fedoraproject.org + certbot_addhost: pkgs01.rdu3.fedoraproject.org tags: - pkgs.fedoraproject.org - when: env == "production" and "iad2" in inventory_hostname + when: env == "production" and "rdu3" in inventory_hostname - role: httpd/website site_name: pkgs.stg.fedoraproject.org ssl: true sslonly: true certbot: true - certbot_addhost: pkgs01.stg.iad2.fedoraproject.org + certbot_addhost: pkgs01.stg.rdu3.fedoraproject.org tags: - pkgs.fedoraproject.org - when: env == "staging" and "iad2" in inventory_hostname + when: env == "staging" and "rdu3" in inventory_hostname # Askbeta -> ask redirects - role: httpd/website diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index 11737da175..036e1a65d6 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -36,22 +36,22 @@ - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' - when: env != 'staging' and datacenter == 'iad2' + when: env != 'staging' - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: env != 'staging' and datacenter == 'iad2' + when: env != 'staging' - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' - when: env != 'staging' and datacenter == 'iad2' + when: env != 'staging' - role: nfs/client mnt_dir: '/mnt/fedora_koji/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: env != 'staging' and datacenter == 'iad2' + when: env != 'staging' # - role: nfs/client # mnt_dir: '/mnt/fedora_koji/koji/ostree' @@ -79,8 +79,8 @@ owner_user: robosignatory owner_group: robosignatory - - {role: linux-system-roles.nbde_client, when: datacenter == 'iad2' and env != 'staging' } - - {role: serial-console, when: datacenter == 'iad2'} + - {role: linux-system-roles.nbde_client, when: env != 'staging' } + - role: serial-console pre_tasks: - import_tasks: "{{ tasks_path }}/yumrepos.yml" diff --git a/playbooks/manual/fas-readonly/fas-readonly.yml b/playbooks/manual/fas-readonly/fas-readonly.yml index e6550b4e51..08f7bdb4a3 100644 --- a/playbooks/manual/fas-readonly/fas-readonly.yml +++ b/playbooks/manual/fas-readonly/fas-readonly.yml @@ -1,6 +1,6 @@ --- - name: Change fas db to readonly for most actions - hosts: db-fas01.iad2.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org + hosts: db-fas01.rdu3.fedoraproject.org:db-fas01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/fas-readonly/rollback-readonly.yml b/playbooks/manual/fas-readonly/rollback-readonly.yml index 568b31b849..56a9825d5d 100644 --- a/playbooks/manual/fas-readonly/rollback-readonly.yml +++ b/playbooks/manual/fas-readonly/rollback-readonly.yml @@ -1,6 +1,6 @@ --- - name: Change fas db to writable again - hosts: db-fas01.iad2.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org + hosts: db-fas01.rdu3.fedoraproject.org:db-fas01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/get-system-packages.yml b/playbooks/manual/get-system-packages.yml index cf0e245b0a..d556f5c4b2 100644 --- a/playbooks/manual/get-system-packages.yml +++ b/playbooks/manual/get-system-packages.yml @@ -4,7 +4,7 @@ --- - name: Get installed packages - hosts: builders:releng-compose:data-analysis01.iad2.fedoraproject.org + hosts: builders:releng-compose:data-analysis01.rdu3.fedoraproject.org gather_facts: true user: root diff --git a/playbooks/manual/import-irc-cookies-to-matrix.yml b/playbooks/manual/import-irc-cookies-to-matrix.yml index 88257e54de..ecec65170f 100644 --- a/playbooks/manual/import-irc-cookies-to-matrix.yml +++ b/playbooks/manual/import-irc-cookies-to-matrix.yml @@ -2,7 +2,7 @@ --- - name: Import the cookies - hosts: value02.iad2.fedoraproject.org:value02.stg.iad2.fedoraproject.org + hosts: value02.rdu3.fedoraproject.org:value02.stg.rdu3.fedoraproject.org user: root vars_files: diff --git a/playbooks/manual/nagios/shush-fmn.yml b/playbooks/manual/nagios/shush-fmn.yml index 51812190c2..15f1b2b6bd 100644 --- a/playbooks/manual/nagios/shush-fmn.yml +++ b/playbooks/manual/nagios/shush-fmn.yml @@ -10,5 +10,5 @@ tasks: - name: Tell nagios to shush. nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/oci-registry-prune.yml b/playbooks/manual/oci-registry-prune.yml index d6affeac75..7871adf77f 100644 --- a/playbooks/manual/oci-registry-prune.yml +++ b/playbooks/manual/oci-registry-prune.yml @@ -5,7 +5,7 @@ --- - name: Prune 30 days old OCI images from candidate-registry - hosts: oci-candidate-registry01.iad2.fedoraproject.org:oci-candidate-registry01.stg.iad2.fedoraproject.org + hosts: oci-candidate-registry01.rdu3.fedoraproject.org:oci-candidate-registry01.stg.rdu3.fedoraproject.org gather_facts: false user: root @@ -22,7 +22,7 @@ days: 30 username: "{{candidate_registry_osbs_prod_username}}" password: "{{candidate_registry_osbs_prod_password}}" - delegate_to: compose-x86-01.iad2.fedoraproject.org + delegate_to: compose-x86-01.rdu3.fedoraproject.org when: env == "production" register: prod_output @@ -38,7 +38,7 @@ days: 30 username: "{{candidate_registry_osbs_stg_username}}" password: "{{candidate_registry_osbs_stg_password}}" - delegate_to: compose-x86-01.iad2.fedoraproject.org + delegate_to: compose-x86-01.rdu3.fedoraproject.org when: env == "staging" register: stg_output diff --git a/playbooks/manual/releng/koji-release-tags.yml b/playbooks/manual/releng/koji-release-tags.yml index d9df250ea2..60b407f745 100644 --- a/playbooks/manual/releng/koji-release-tags.yml +++ b/playbooks/manual/releng/koji-release-tags.yml @@ -1,6 +1,6 @@ --- - name: Create the release tags in koji. - hosts: compose-x86-01.stg.iad2.fedoraproject.org + hosts: compose-x86-01.stg.rdu3.fedoraproject.org gather_facts: no vars_files: - /srv/web/infra/ansible/vars/all/00-FedoraCycleNumber.yaml diff --git a/playbooks/manual/releng/templates/koji.conf.j2 b/playbooks/manual/releng/templates/koji.conf.j2 index 18e63c4776..0e63dcf3d0 100644 --- a/playbooks/manual/releng/templates/koji.conf.j2 +++ b/playbooks/manual/releng/templates/koji.conf.j2 @@ -19,11 +19,11 @@ krbservice = compose {% if env == "staging" %} principal = compose/koji.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG krb_server_realm = STG.FEDORAPROJECT.ORG -keytab = /etc/krb5.compose_koji.stg.iad2.fedoraproject.org.keytab +keytab = /etc/krb5.compose_koji.stg.rdu3.fedoraproject.org.keytab {% else %} principal = compose/koji.fedoraproject.org@FEDORAPROJECT.ORG krb_server_realm = FEDORAPROJECT.ORG -keytab = /etc/krb5.compose_koji.iad2.fedoraproject.org.keytab +keytab = /etc/krb5.compose_koji.rdu3.fedoraproject.org.keytab {%endif%} ;enable to lookup dns canonical hostname for krb auth diff --git a/playbooks/manual/restart-pagure.yml b/playbooks/manual/restart-pagure.yml index 65e2c70170..be3bc4c0e0 100644 --- a/playbooks/manual/restart-pagure.yml +++ b/playbooks/manual/restart-pagure.yml @@ -18,5 +18,5 @@ post_tasks: - name: Tell nagios to unshush w.r.t. apache nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/riscv-keytabs.yml b/playbooks/manual/riscv-keytabs.yml index d8f05b6407..aa42d510ca 100644 --- a/playbooks/manual/riscv-keytabs.yml +++ b/playbooks/manual/riscv-keytabs.yml @@ -1,5 +1,5 @@ - name: make some keytabs - hosts: riscv-koji01.iad2.fedoraproject.org + hosts: riscv-koji01.rdu3.fedoraproject.org vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index c4ed90d908..ea5514f657 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -8,7 +8,7 @@ --- - name: Make sign-vault server vm (secondary and stg only) - hosts: sign-vault01.stg.iad2.fedoraproject.org + hosts: sign-vault01.stg.rdu3.fedoraproject.org user: root gather_facts: false @@ -36,8 +36,8 @@ roles: - base - rkhunter - - { role: linux-system-roles.nbde_client, when: datacenter == 'iad2' or datacenter == 'rdu3' } - - { role: serial-console, when: datacenter == 'iad2' or datacenter == 'rdu3' } + - { role: linux-system-roles.nbde_client, when: datacenter == 'rdu3' } + - { role: serial-console, when: datacenter == 'rdu3' } - sigul/server pre_tasks: diff --git a/playbooks/manual/staging-sync/badges.yml b/playbooks/manual/staging-sync/badges.yml index 1d90ef3580..f630dbfce4 100644 --- a/playbooks/manual/staging-sync/badges.yml +++ b/playbooks/manual/staging-sync/badges.yml @@ -1,7 +1,7 @@ # This playbook syncs the production badges instance with staging. --- - name: Bring staging services down - hosts: os-control01.stg.iad2.fedoraproject.org + hosts: os-control01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -14,7 +14,7 @@ # Here's the meaty part in the middle - name: Drop and re-create the staging db entirely - hosts: db01.stg.iad2.fedoraproject.org + hosts: db01.stg.rdu3.fedoraproject.org user: root become: yes become_user: postgres @@ -46,7 +46,7 @@ ansible.builtin.shell: psql -v ON_ERROR_STOP=1 {{ badges_db_name }} <<< "UPDATE persons SET email = REPLACE(email, '@fedoraproject.org', '@stg.fedoraproject.org')" - name: Bring staging services up - hosts: os-control01.stg.iad2.fedoraproject.org + hosts: os-control01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/staging-sync/bodhi.yml b/playbooks/manual/staging-sync/bodhi.yml index 515384b7c6..52461978bd 100644 --- a/playbooks/manual/staging-sync/bodhi.yml +++ b/playbooks/manual/staging-sync/bodhi.yml @@ -12,7 +12,7 @@ - service: name=httpd state=stopped - name: Bring staging services down (OpenShift web services) - hosts: os-control01.stg.iad2.fedoraproject.org + hosts: os-control01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -42,7 +42,7 @@ # Here's the meaty part in the middle - name: Drop and re-create the staging db entirely - hosts: db01.stg.iad2.fedoraproject.org + hosts: db01.stg.rdu3.fedoraproject.org user: root become: yes become_user: postgres @@ -70,7 +70,7 @@ - ansible.builtin.file: path=/var/tmp/bodhi2.dump state=absent - name: Bring staging services up (OpenShift web services) - hosts: os-control01.stg.iad2.fedoraproject.org + hosts: os-control01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/staging-sync/db-sync.yml b/playbooks/manual/staging-sync/db-sync.yml index f8287ad4fb..ffae3459fb 100644 --- a/playbooks/manual/staging-sync/db-sync.yml +++ b/playbooks/manual/staging-sync/db-sync.yml @@ -4,19 +4,19 @@ # Usage: # --extra-vars="dbhost='db01' server='pkgdb01.stg' db='pkgdb2'" # dbhost => The hostname for the database server (db01, db02...), the -# .iad2.fedoraproject.org part is automatically added. +# .rdu3.fedoraproject.org part is automatically added. # Since this playbook syncs from stg to prod only, it is assumed you # are migrating from dbX to dbX.stg) # server => The application server where apache will be turned off during the # sync. /!\ it should be the *stg* server, not prod (the one you want # to load the new DB for) -# Can be a full hostname (foo01.iad2.fp.o) or a group (foo-stg) or an +# Can be a full hostname (foo01.rdu3.fp.o) or a group (foo-stg) or an # emptry string (''), for example if the app is running in openshift. # db => The database name on both database server (must be the same) --- - name: Dump the prod db out - hosts: "{{ dbhost }}.iad2.fedoraproject.org" + hosts: "{{ dbhost }}.rdu3.fedoraproject.org" user: root become: yes become_user: postgres @@ -41,7 +41,7 @@ flat: yes - name: Bring staging services down - hosts: "{{ server or 'batcave01.iad2.fedoraproject.org' }}" + hosts: "{{ server or 'batcave01.rdu3.fedoraproject.org' }}" user: root any_errors_fatal: false vars_files: @@ -57,7 +57,7 @@ when: (server is defined) and (server|length > 0) - name: Drop and re-create the staging db entirely - hosts: "{{ dbhost }}.stg.iad2.fedoraproject.org" + hosts: "{{ dbhost }}.stg.rdu3.fedoraproject.org" user: root become: yes become_user: postgres @@ -92,7 +92,7 @@ ansible.builtin.shell: cat /var/tmp/{{ db }}.dump | psql {{ db }} - name: Bring staging services up - hosts: "{{ server or 'batcave01.iad2.fedoraproject.org' }}" + hosts: "{{ server or 'batcave01.rdu3.fedoraproject.org' }}" user: root any_errors_fatal: false vars_files: @@ -108,7 +108,7 @@ when: (server is defined) and (server|length > 0) - name: Remove the prod db dump now that we are done - hosts: "{{ dbhost }}.iad2.fedoraproject.org" + hosts: "{{ dbhost }}.rdu3.fedoraproject.org" user: root become: yes become_user: postgres @@ -126,7 +126,7 @@ ansible.builtin.command: rm -f /var/tmp/{{ db }}.dump.xz - name: Remove the prod db dump on batcave - hosts: batcave01.iad2.fedoraproject.org + hosts: batcave01.rdu3.fedoraproject.org user: root vars_files: diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index cabb4edaaa..6db7f357ea 100644 --- a/playbooks/manual/staging-sync/koji.yml +++ b/playbooks/manual/staging-sync/koji.yml @@ -26,7 +26,7 @@ - name: Drop and re-create the staging db entirely - hosts: db-koji01.stg.iad2.fedoraproject.org + hosts: db-koji01.stg.rdu3.fedoraproject.org user: root become: yes become_user: postgres diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml index b8b841ff8f..7b56ddf260 100644 --- a/playbooks/manual/staging-sync/mailman.yml +++ b/playbooks/manual/staging-sync/mailman.yml @@ -20,7 +20,7 @@ - name: Drop and re-create the staging dbs entirely - hosts: db01.stg.iad2.fedoraproject.org + hosts: db01.stg.rdu3.fedoraproject.org user: root become: yes become_user: postgres diff --git a/playbooks/manual/staging-sync/templates/koji-reset-staging.sql b/playbooks/manual/staging-sync/templates/koji-reset-staging.sql index e9372e7594..508e53f8b3 100644 --- a/playbooks/manual/staging-sync/templates/koji-reset-staging.sql +++ b/playbooks/manual/staging-sync/templates/koji-reset-staging.sql @@ -123,11 +123,11 @@ insert into cg_users (cg_id, user_id, creator_id) values ( -- Fix krb principals for some users {% for user_id, principal in [('3445', 'compose/koji.stg.fedoraproject.org'), - ('3199', 'koschei/koschei-backend01.stg.iad2.fedoraproject.org'), - ('3139', 'hotness/hotness01.stg.iad2.fedoraproject.org'), + ('3199', 'koschei/koschei-backend01.stg.rdu3.fedoraproject.org'), + ('3139', 'hotness/hotness01.stg.rdu3.fedoraproject.org'), ('3538', 'osbs/osbs.stg.fedoraproject.org'), ('428', 'bodhi/bodhi.stg.fedoraproject.org'), - ('3638', 'autosign/autosign01.stg.iad2.fedoraproject.org'), + ('3638', 'autosign/autosign01.stg.rdu3.fedoraproject.org'), ('129', 'kojira/koji.stg.fedoraproject.org')] %} update user_krb_principals set krb_principal='{{principal}}@STG.FEDORAPROJECT.ORG' where user_id='{{user_id}}'; {% endfor %} diff --git a/playbooks/manual/sync-hosts.yml b/playbooks/manual/sync-hosts.yml index 38a1581c67..66537d236d 100644 --- a/playbooks/manual/sync-hosts.yml +++ b/playbooks/manual/sync-hosts.yml @@ -5,8 +5,8 @@ # # Example: # ansible-playbook sync-hosts.yml --extra-vars \ -# "remote_src_host=bodhi-backend01.iad2.fedoraproject.org \ -# remote_dest_host=sundries01.iad2.fedoraproject.org" +# "remote_src_host=bodhi-backend01.rdu3.fedoraproject.org \ +# remote_dest_host=sundries01.rdu3.fedoraproject.org" --- - hosts: localhost user: root diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index 75c9eb3fd7..ec1d7caa5c 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -74,13 +74,13 @@ pre_tasks: - name: Tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true tasks: - set_fact: # This will be a bool that indicates whether we need to run migrations or not. - migrations: "'(head)' not in hostvars['bodhi-backend01{{ env_suffix }}.iad2.fedoraproject.org']['current_migration_version'].stdout" + migrations: "'(head)' not in hostvars['bodhi-backend01{{ env_suffix }}.rdu3.fedoraproject.org']['current_migration_version'].stdout" - name: Scale down to 0 pods ansible.builtin.command: oc -n bodhi scale dc/bodhi-web --replicas=0 when: migrations @@ -98,7 +98,7 @@ pre_tasks: - name: Tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true roles: @@ -129,7 +129,7 @@ post_tasks: - name: Tell nagios to unshush w.r.t. the backend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true - name: Restart the frontend @@ -171,5 +171,5 @@ post_tasks: - name: Tell nagios to unshush w.r.t. the frontend nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/bugzilla2fedmsg.yml b/playbooks/manual/upgrade/bugzilla2fedmsg.yml index 53454ed6de..84eb0fe680 100644 --- a/playbooks/manual/upgrade/bugzilla2fedmsg.yml +++ b/playbooks/manual/upgrade/bugzilla2fedmsg.yml @@ -35,7 +35,7 @@ pre_tasks: - name: Tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true roles: @@ -45,5 +45,5 @@ - service: name="moksha-hub" state=restarted - name: Tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/datagrepper.yml b/playbooks/manual/upgrade/datagrepper.yml index 3fd178980d..2de09e11e5 100644 --- a/playbooks/manual/upgrade/datagrepper.yml +++ b/playbooks/manual/upgrade/datagrepper.yml @@ -35,7 +35,7 @@ pre_tasks: - name: Tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true roles: @@ -46,5 +46,5 @@ - name: Tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/datanommer.yml b/playbooks/manual/upgrade/datanommer.yml index e1a25b8883..869786fbca 100644 --- a/playbooks/manual/upgrade/datanommer.yml +++ b/playbooks/manual/upgrade/datanommer.yml @@ -13,7 +13,7 @@ pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true roles: - badges/backend @@ -108,5 +108,5 @@ post_tasks: - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/koji.yml b/playbooks/manual/upgrade/koji.yml index 0296f97b6f..b1288dc38c 100644 --- a/playbooks/manual/upgrade/koji.yml +++ b/playbooks/manual/upgrade/koji.yml @@ -46,7 +46,7 @@ - name: Tell nagios that everything is fine nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true - name: Stop httpd on the koji-hubs. @@ -56,7 +56,7 @@ # Note that the hosts are used explicitly here to choose only the "primary". # We don't want to run upgrades on both pgbdr nodes at the same time. # ... is anything special needed to upgrade pgbdr nodes? - hosts: db-koji01.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org + hosts: db-koji01.rdu3.fedoraproject.org:db-koji01.stg.rdu3.fedoraproject.org user: root vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -92,7 +92,7 @@ service: name="httpd" state=started - name: Unsilence nagios nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true - name: Update and restart the koji builders, now that we're done with the hubs diff --git a/playbooks/manual/upgrade/mote.yml b/playbooks/manual/upgrade/mote.yml index 876d724b6d..4e94b78de4 100644 --- a/playbooks/manual/upgrade/mote.yml +++ b/playbooks/manual/upgrade/mote.yml @@ -35,7 +35,7 @@ pre_tasks: - name: Tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true roles: @@ -46,5 +46,5 @@ - service: name="mote-updater" state=restarted - name: Tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/manual/upgrade/pagure.yml b/playbooks/manual/upgrade/pagure.yml index 89f58417b4..a889fc12ae 100644 --- a/playbooks/manual/upgrade/pagure.yml +++ b/playbooks/manual/upgrade/pagure.yml @@ -25,7 +25,7 @@ minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true ## @@ -120,5 +120,5 @@ action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index 35ab365d1c..9c7169905d 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/playbooks/openshift-apps/fmn.yml @@ -25,7 +25,7 @@ encoding: UTF-8 - name: Setup RabbitMQ - hosts: rabbitmq_iad2[0]:rabbitmq_stg_iad2[0]:rabbitmq_rdu3[0]:rabbitmq_stg_rdu3[0] + hosts: rabbitmq_rdu3[0]:rabbitmq_stg_rdu3[0] user: root gather_facts: false diff --git a/playbooks/universe_update.yml b/playbooks/universe_update.yml index c51207d48f..53fa97f453 100644 --- a/playbooks/universe_update.yml +++ b/playbooks/universe_update.yml @@ -13,7 +13,7 @@ - name: Silence nagios completely nagios: action=silence - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true failed_when: no when: nonagios is not defined or not "true" in nonagios diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index 592823f790..07e031eda1 100644 --- a/playbooks/update_ticketkey.yml +++ b/playbooks/update_ticketkey.yml @@ -1,6 +1,6 @@ --- - name: make a new ssl ticketkey - hosts: batcave01.iad2.fedoraproject.org + hosts: batcave01.rdu3.fedoraproject.org user: root vars_files: diff --git a/playbooks/vhost_halt_guests.yml b/playbooks/vhost_halt_guests.yml index e6ad857328..9aace3a926 100644 --- a/playbooks/vhost_halt_guests.yml +++ b/playbooks/vhost_halt_guests.yml @@ -42,7 +42,7 @@ tasks: - name: Tell nagios to shush nagios: action=silence host={{ inventory_hostname_short }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org - name: Echo-y ansible.builtin.command: /sbin/halt -p diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 0396573a4e..b0c6efd439 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -61,7 +61,7 @@ - name: schedule regular host downtime nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true when: nonagios is not defined or not nonagios @@ -87,7 +87,7 @@ tasks: - name: tell nagios to shush nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true when: nonagios is not defined or not nonagios @@ -111,7 +111,7 @@ - name: tell nagios to unshush nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true when: nonagios is not defined or not nonagios diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index 6a7267ecf1..c2aaec2f1d 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -41,7 +41,7 @@ - name: Schedule regular host downtime nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org + delegate_to: noc01.rdu3.fedoraproject.org ignore_errors: true failed_when: no when: nonagios is not defined or not "true" in nonagios diff --git a/roles/base/files/postfix/main.cf/main.cf.gateway b/roles/base/files/postfix/main.cf/main.cf.gateway index e9a13a0ad4..e2b0651e19 100644 --- a/roles/base/files/postfix/main.cf/main.cf.gateway +++ b/roles/base/files/postfix/main.cf/main.cf.gateway @@ -296,7 +296,7 @@ unknown_local_recipient_reject_code = 550 #mynetworks = $config_directory/mynetworks #mynetworks = hash:/etc/postfix/network_table -mynetworks = localhost.localdomain, localhost, 127.0.0.1, 10.3.160.0/19, 192.168.0.0/16, 18.208.24.211, 3.225.109.36, 10.16.160.0/19 +mynetworks = localhost.localdomain, localhost, 127.0.0.1, 192.168.0.0/16, 18.208.24.211, 3.225.109.36, 10.16.160.0/19 # The relay_domains parameter restricts what destinations this system will # relay mail to. See the smtpd_recipient_restrictions description in diff --git a/roles/base/files/postfix/main.cf/main.cf.iad2 b/roles/base/files/postfix/main.cf/main.cf.iad2 deleted file mode 100644 index acb3f34cc0..0000000000 --- a/roles/base/files/postfix/main.cf/main.cf.iad2 +++ /dev/null @@ -1,692 +0,0 @@ -# Global Postfix configuration file. This file lists only a subset -# of all parameters. For the syntax, and for a complete parameter -# list, see the postconf(5) manual page (command: "man 5 postconf"). -# -# For common configuration examples, see BASIC_CONFIGURATION_README -# and STANDARD_CONFIGURATION_README. To find these documents, use -# the command "postconf html_directory readme_directory", or go to -# http://www.postfix.org/. -# -# For best results, change no more than 2-3 parameters at a time, -# and test if Postfix still works after every change. - -# SOFT BOUNCE -# -# The soft_bounce parameter provides a limited safety net for -# testing. When soft_bounce is enabled, mail will remain queued that -# would otherwise bounce. This parameter disables locally-generated -# bounces, and prevents the SMTP server from rejecting mail permanently -# (by changing 5xx replies into 4xx replies). However, soft_bounce -# is no cure for address rewriting mistakes or mail routing mistakes. -# -#soft_bounce = no - -# LOCAL PATHNAME INFORMATION -# -# The queue_directory specifies the location of the Postfix queue. -# This is also the root directory of Postfix daemons that run chrooted. -# See the files in examples/chroot-setup for setting up Postfix chroot -# environments on different UNIX systems. -# -queue_directory = /var/spool/postfix - -# The command_directory parameter specifies the location of all -# postXXX commands. -# -command_directory = /usr/sbin - -# The daemon_directory parameter specifies the location of all Postfix -# daemon programs (i.e. programs listed in the master.cf file). This -# directory must be owned by root. -# -daemon_directory = /usr/libexec/postfix - -# QUEUE AND PROCESS OWNERSHIP -# -# The mail_owner parameter specifies the owner of the Postfix queue -# and of most Postfix daemon processes. Specify the name of a user -# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS -# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In -# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED -# USER. -# -mail_owner = postfix - -# The default_privs parameter specifies the default rights used by -# the local delivery agent for delivery to external file or command. -# These rights are used in the absence of a recipient user context. -# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. -# -#default_privs = nobody - -# INTERNET HOST AND DOMAIN NAMES -# -# The myhostname parameter specifies the internet hostname of this -# mail system. The default is to use the fully-qualified domain name -# from gethostname(). $myhostname is used as a default value for many -# other configuration parameters. -# -#myhostname = host.domain.tld -#myhostname = virtual.domain.tld - -# The mydomain parameter specifies the local internet domain name. -# The default is to use $myhostname minus the first component. -# $mydomain is used as a default value for many other configuration -# parameters. -# -#mydomain = domain.tld - -# SENDING MAIL -# -# The myorigin parameter specifies the domain that locally-posted -# mail appears to come from. The default is to append $myhostname, -# which is fine for small sites. If you run a domain with multiple -# machines, you should (1) change this to $mydomain and (2) set up -# a domain-wide alias database that aliases each user to -# user@that.users.mailhost. -# -# For the sake of consistency between sender and recipient addresses, -# myorigin also specifies the default domain name that is appended -# to recipient addresses that have no @domain part. -# -#myorigin = $myhostname -#myorigin = $mydomain - -mydomain = fedoraproject.org -myorigin = fedoraproject.org - -# RECEIVING MAIL - -# The inet_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on. By default, -# the software claims all active interfaces on the machine. The -# parameter also controls delivery of mail to user@[ip.address]. -# -# See also the proxy_interfaces parameter, for network addresses that -# are forwarded to us via a proxy or network address translator. -# -# Note: you need to stop/start Postfix when this parameter changes. -# -#inet_interfaces = all -#inet_interfaces = $myhostname -#inet_interfaces = $myhostname, localhost - - -# The proxy_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on by way of a -# proxy or network address translation unit. This setting extends -# the address list specified with the inet_interfaces parameter. -# -# You must specify your proxy/NAT addresses when your system is a -# backup MX host for other domains, otherwise mail delivery loops -# will happen when the primary MX host is down. -# -#proxy_interfaces = -#proxy_interfaces = 1.2.3.4 - -# The mydestination parameter specifies the list of domains that this -# machine considers itself the final destination for. -# -# These domains are routed to the delivery agent specified with the -# local_transport parameter setting. By default, that is the UNIX -# compatible delivery agent that lookups all recipients in /etc/passwd -# and /etc/aliases or their equivalent. -# -# The default is $myhostname + localhost.$mydomain. On a mail domain -# gateway, you should also include $mydomain. -# -# Do not specify the names of virtual domains - those domains are -# specified elsewhere (see VIRTUAL_README). -# -# Do not specify the names of domains that this machine is backup MX -# host for. Specify those names via the relay_domains settings for -# the SMTP server, or use permit_mx_backup if you are lazy (see -# STANDARD_CONFIGURATION_README). -# -# The local machine is always the final destination for mail addressed -# to user@[the.net.work.address] of an interface that the mail system -# receives mail on (see the inet_interfaces parameter). -# -# Specify a list of host or domain names, /file/name or type:table -# patterns, separated by commas and/or whitespace. A /file/name -# pattern is replaced by its contents; a type:table is matched when -# a name matches a lookup key (the right-hand side is ignored). -# Continue long lines by starting the next line with whitespace. -# -# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". -# -mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost -#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain -#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, -# mail.$mydomain, www.$mydomain, ftp.$mydomain - -# REJECTING MAIL FOR UNKNOWN LOCAL USERS -# -# The local_recipient_maps parameter specifies optional lookup tables -# with all names or addresses of users that are local with respect -# to $mydestination, $inet_interfaces or $proxy_interfaces. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown local users. This parameter is defined by default. -# -# To turn off local recipient checking in the SMTP server, specify -# local_recipient_maps = (i.e. empty). -# -# The default setting assumes that you use the default Postfix local -# delivery agent for local delivery. You need to update the -# local_recipient_maps setting if: -# -# - You define $mydestination domain recipients in files other than -# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. -# For example, you define $mydestination domain recipients in -# the $virtual_mailbox_maps files. -# -# - You redefine the local delivery agent in master.cf. -# -# - You redefine the "local_transport" setting in main.cf. -# -# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" -# feature of the Postfix local delivery agent (see local(8)). -# -# Details are described in the LOCAL_RECIPIENT_README file. -# -# Beware: if the Postfix SMTP server runs chrooted, you probably have -# to access the passwd file via the proxymap service, in order to -# overcome chroot restrictions. The alternative, having a copy of -# the system passwd file in the chroot jail is just not practical. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify a bare username, an @domain.tld -# wild-card, or specify a user@domain.tld address. -# -#local_recipient_maps = unix:passwd.byname $alias_maps -#local_recipient_maps = proxy:unix:passwd.byname $alias_maps -#local_recipient_maps = - -# The unknown_local_recipient_reject_code specifies the SMTP server -# response code when a recipient domain matches $mydestination or -# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty -# and the recipient address or address local-part is not found. -# -# The default setting is 550 (reject mail) but it is safer to start -# with 450 (try again later) until you are certain that your -# local_recipient_maps settings are OK. -# -unknown_local_recipient_reject_code = 550 - -# TRUST AND RELAY CONTROL - -# The mynetworks parameter specifies the list of "trusted" SMTP -# clients that have more privileges than "strangers". -# -# In particular, "trusted" SMTP clients are allowed to relay mail -# through Postfix. See the smtpd_recipient_restrictions parameter -# in postconf(5). -# -# You can specify the list of "trusted" network addresses by hand -# or you can let Postfix do it for you (which is the default). -# -# By default (mynetworks_style = subnet), Postfix "trusts" SMTP -# clients in the same IP subnetworks as the local machine. -# On Linux, this does works correctly only with interfaces specified -# with the "ifconfig" command. -# -# Specify "mynetworks_style = class" when Postfix should "trust" SMTP -# clients in the same IP class A/B/C networks as the local machine. -# Don't do this with a dialup site - it would cause Postfix to "trust" -# your entire provider's network. Instead, specify an explicit -# mynetworks list by hand, as described below. -# -# Specify "mynetworks_style = host" when Postfix should "trust" -# only the local machine. -# -#mynetworks_style = class -#mynetworks_style = subnet -#mynetworks_style = host - -# Alternatively, you can specify the mynetworks list by hand, in -# which case Postfix ignores the mynetworks_style setting. -# -# Specify an explicit list of network/netmask patterns, where the -# mask specifies the number of bits in the network part of a host -# address. -# -# You can also specify the absolute pathname of a pattern file instead -# of listing the patterns here. Specify type:table for table-based lookups -# (the value on the table right-hand side is not used). -# -#mynetworks = 168.100.189.0/28, 127.0.0.0/8 -#mynetworks = $config_directory/mynetworks -#mynetworks = hash:/etc/postfix/network_table - - -# The relay_domains parameter restricts what destinations this system will -# relay mail to. See the smtpd_recipient_restrictions description in -# postconf(5) for detailed information. -# -# By default, Postfix relays mail -# - from "trusted" clients (IP address matches $mynetworks) to any destination, -# - from "untrusted" clients to destinations that match $relay_domains or -# subdomains thereof, except addresses with sender-specified routing. -# The default relay_domains value is $mydestination. -# -# In addition to the above, the Postfix SMTP server by default accepts mail -# that Postfix is final destination for: -# - destinations that match $inet_interfaces or $proxy_interfaces, -# - destinations that match $mydestination -# - destinations that match $virtual_alias_domains, -# - destinations that match $virtual_mailbox_domains. -# These destinations do not need to be listed in $relay_domains. -# -# Specify a list of hosts or domains, /file/name patterns or type:name -# lookup tables, separated by commas and/or whitespace. Continue -# long lines by starting the next line with whitespace. A file name -# is replaced by its contents; a type:name table is matched when a -# (parent) domain appears as lookup key. -# -# NOTE: Postfix will not automatically forward mail for domains that -# list this system as their primary or backup MX host. See the -# permit_mx_backup restriction description in postconf(5). -# -#relay_domains = $mydestination - - - -# INTERNET OR INTRANET - -# The relayhost parameter specifies the default host to send mail to -# when no entry is matched in the optional transport(5) table. When -# no relayhost is given, mail is routed directly to the destination. -# -# On an intranet, specify the organizational domain name. If your -# internal DNS uses no MX records, specify the name of the intranet -# gateway host instead. -# -# In the case of SMTP, specify a domain, host, host:port, [host]:port, -# [address] or [address]:port; the form [host] turns off MX lookups. -# -# If you're connected via UUCP, see also the default_transport parameter. -# -#relayhost = $mydomain -#relayhost = [gateway.my.domain] -#relayhost = [mailserver.isp.tld] -#relayhost = uucphost -#relayhost = [an.ip.add.ress] -relayhost = bastion.iad2.fedoraproject.org - - -# REJECTING UNKNOWN RELAY USERS -# -# The relay_recipient_maps parameter specifies optional lookup tables -# with all addresses in the domains that match $relay_domains. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown relay users. This feature is off by default. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify an @domain.tld wild-card, or specify -# a user@domain.tld address. -# -#relay_recipient_maps = hash:/etc/postfix/relay_recipients - -# INPUT RATE CONTROL -# -# The in_flow_delay configuration parameter implements mail input -# flow control. This feature is turned on by default, although it -# still needs further development (it's disabled on SCO UNIX due -# to an SCO bug). -# -# A Postfix process will pause for $in_flow_delay seconds before -# accepting a new message, when the message arrival rate exceeds the -# message delivery rate. With the default 100 SMTP server process -# limit, this limits the mail inflow to 100 messages a second more -# than the number of messages delivered per second. -# -# Specify 0 to disable the feature. Valid delays are 0..10. -# -#in_flow_delay = 1s - -# ADDRESS REWRITING -# -# The ADDRESS_REWRITING_README document gives information about -# address masquerading or other forms of address rewriting including -# username->Firstname.Lastname mapping. - -masquerade_domains = redhat.com -masquerade_exceptions = root apache - -# ADDRESS REDIRECTION (VIRTUAL DOMAIN) -# -# The VIRTUAL_README document gives information about the many forms -# of domain hosting that Postfix supports. - -# "USER HAS MOVED" BOUNCE MESSAGES -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# TRANSPORT MAP -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# ALIAS DATABASE -# -# The alias_maps parameter specifies the list of alias databases used -# by the local delivery agent. The default list is system dependent. -# -# On systems with NIS, the default is to search the local alias -# database, then the NIS alias database. See aliases(5) for syntax -# details. -# -# If you change the alias database, run "postalias /etc/aliases" (or -# wherever your system stores the mail alias file), or simply run -# "newaliases" to build the necessary DBM or DB file. -# -# It will take a minute or so before changes become visible. Use -# "postfix reload" to eliminate the delay. -# -#alias_maps = dbm:/etc/aliases -alias_maps = hash:/etc/aliases -#alias_maps = hash:/etc/aliases, nis:mail.aliases -#alias_maps = netinfo:/aliases - -# The alias_database parameter specifies the alias database(s) that -# are built with "newaliases" or "sendmail -bi". This is a separate -# configuration parameter, because alias_maps (see above) may specify -# tables that are not necessarily all under control by Postfix. -# -#alias_database = dbm:/etc/aliases -#alias_database = dbm:/etc/mail/aliases -alias_database = hash:/etc/aliases -#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases - -# ADDRESS EXTENSIONS (e.g., user+foo) -# -# The recipient_delimiter parameter specifies the separator between -# user names and address extensions (user+foo). See canonical(5), -# local(8), relocated(5) and virtual(5) for the effects this has on -# aliases, canonical, virtual, relocated and .forward file lookups. -# Basically, the software tries user+foo and .forward+foo before -# trying user and .forward. -# -recipient_delimiter = + - -# DELIVERY TO MAILBOX -# -# The home_mailbox parameter specifies the optional pathname of a -# mailbox file relative to a user's home directory. The default -# mailbox file is /var/spool/mail/user or /var/mail/user. Specify -# "Maildir/" for qmail-style delivery (the / is required). -# -#home_mailbox = Mailbox -#home_mailbox = Maildir/ - -# The mail_spool_directory parameter specifies the directory where -# UNIX-style mailboxes are kept. The default setting depends on the -# system type. -# -#mail_spool_directory = /var/mail -#mail_spool_directory = /var/spool/mail - -# The mailbox_command parameter specifies the optional external -# command to use instead of mailbox delivery. The command is run as -# the recipient with proper HOME, SHELL and LOGNAME environment settings. -# Exception: delivery for root is done as $default_user. -# -# Other environment variables of interest: USER (recipient username), -# EXTENSION (address extension), DOMAIN (domain part of address), -# and LOCAL (the address localpart). -# -# Unlike other Postfix configuration parameters, the mailbox_command -# parameter is not subjected to $parameter substitutions. This is to -# make it easier to specify shell syntax (see example below). -# -# Avoid shell meta characters because they will force Postfix to run -# an expensive shell process. Procmail alone is expensive enough. -# -# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN -# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. -# -#mailbox_command = /usr/bin/procmail -#mailbox_command = /some/where/procmail -a "$EXTENSION" - -# The mailbox_transport specifies the optional transport in master.cf -# to use after processing aliases and .forward files. This parameter -# has precedence over the mailbox_command, fallback_transport and -# luser_relay parameters. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp - -# If using the cyrus-imapd IMAP server deliver local mail to the IMAP -# server using LMTP (Local Mail Transport Protocol), this is prefered -# over the older cyrus deliver program by setting the -# mailbox_transport as below: -# -# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp -# -# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via -# these settings. -# -# local_destination_recipient_limit = 300 -# local_destination_concurrency_limit = 5 -# -# Of course you should adjust these settings as appropriate for the -# capacity of the hardware you are using. The recipient limit setting -# can be used to take advantage of the single instance message store -# capability of Cyrus. The concurrency limit can be used to control -# how many simultaneous LMTP sessions will be permitted to the Cyrus -# message store. -# -# To use the old cyrus deliver program you have to set: -#mailbox_transport = cyrus - -# The fallback_transport specifies the optional transport in master.cf -# to use for recipients that are not found in the UNIX passwd database. -# This parameter has precedence over the luser_relay parameter. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp -#fallback_transport = - -#transport_maps = hash:/etc/postfix/transport -# The luser_relay parameter specifies an optional destination address -# for unknown recipients. By default, mail for unknown@$mydestination, -# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned -# as undeliverable. -# -# The following expansions are done on luser_relay: $user (recipient -# username), $shell (recipient shell), $home (recipient home directory), -# $recipient (full recipient address), $extension (recipient address -# extension), $domain (recipient domain), $local (entire recipient -# localpart), $recipient_delimiter. Specify ${name?value} or -# ${name:value} to expand value only when $name does (does not) exist. -# -# luser_relay works only for the default Postfix local delivery agent. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must specify "local_recipient_maps =" (i.e. empty) in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#luser_relay = $user@other.host -#luser_relay = $local@other.host -#luser_relay = admin+$local - -# JUNK MAIL CONTROLS -# -# The controls listed here are only a very small subset. The file -# SMTPD_ACCESS_README provides an overview. - -# The header_checks parameter specifies an optional table with patterns -# that each logical message header is matched against, including -# headers that span multiple physical lines. -# -# By default, these patterns also apply to MIME headers and to the -# headers of attached messages. With older Postfix versions, MIME and -# attached message headers were treated as body text. -# -# For details, see "man header_checks". -# -header_checks = regexp:/etc/postfix/header_checks - -# FAST ETRN SERVICE -# -# Postfix maintains per-destination logfiles with information about -# deferred mail, so that mail can be flushed quickly with the SMTP -# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". -# See the ETRN_README document for a detailed description. -# -# The fast_flush_domains parameter controls what destinations are -# eligible for this service. By default, they are all domains that -# this server is willing to relay mail to. -# -#fast_flush_domains = $relay_domains - -# SHOW SOFTWARE VERSION OR NOT -# -# The smtpd_banner parameter specifies the text that follows the 220 -# code in the SMTP server's greeting banner. Some people like to see -# the mail version advertised. By default, Postfix shows no version. -# -# You MUST specify $myhostname at the start of the text. That is an -# RFC requirement. Postfix itself does not care. -# -#smtpd_banner = $myhostname ESMTP $mail_name -#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) - -# PARALLEL DELIVERY TO THE SAME DESTINATION -# -# How many parallel deliveries to the same user or domain? With local -# delivery, it does not make sense to do massively parallel delivery -# to the same user, because mailbox updates must happen sequentially, -# and expensive pipelines in .forward files can cause disasters when -# too many are run at the same time. With SMTP deliveries, 10 -# simultaneous connections to the same domain could be sufficient to -# raise eyebrows. -# -# Each message delivery transport has its XXX_destination_concurrency_limit -# parameter. The default is $default_destination_concurrency_limit for -# most delivery transports. For the local delivery agent the default is 2. - -#local_destination_concurrency_limit = 2 -#default_destination_concurrency_limit = 20 - -# DEBUGGING CONTROL -# -# The debug_peer_level parameter specifies the increment in verbose -# logging level when an SMTP client or server host name or address -# matches a pattern in the debug_peer_list parameter. -# -debug_peer_level = 2 - -# The debug_peer_list parameter specifies an optional list of domain -# or network patterns, /file/name patterns or type:name tables. When -# an SMTP client or server host name or address matches a pattern, -# increase the verbose logging level by the amount specified in the -# debug_peer_level parameter. -# -#debug_peer_list = 127.0.0.1 -#debug_peer_list = some.domain - -# The debugger_command specifies the external command that is executed -# when a Postfix daemon program is run with the -D option. -# -# Use "command .. & sleep 5" so that the debugger can attach before -# the process marches on. If you use an X-based debugger, be sure to -# set up your XAUTHORITY environment variable before starting Postfix. -# -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - xxgdb $daemon_directory/$process_name $process_id & sleep 5 - -# If you can't use X, use this to capture the call stack when a -# daemon crashes. The result is in a file in the configuration -# directory, and is named after the process name and the process ID. -# -# debugger_command = -# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; -# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 -# >$config_directory/$process_name.$process_id.log & sleep 5 -# -# Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r -# " where uniquely matches one of the detached -# sessions (from "screen -list"). -# -# debugger_command = -# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen -# -dmS $process_name gdb $daemon_directory/$process_name -# $process_id & sleep 1 - -# INSTALL-TIME CONFIGURATION INFORMATION -# -# The following parameters are used when installing a new Postfix version. -# -# sendmail_path: The full pathname of the Postfix sendmail command. -# This is the Sendmail-compatible mail posting interface. -# -sendmail_path = /usr/sbin/sendmail.postfix - -# newaliases_path: The full pathname of the Postfix newaliases command. -# This is the Sendmail-compatible command to build alias databases. -# -newaliases_path = /usr/bin/newaliases.postfix - -# mailq_path: The full pathname of the Postfix mailq command. This -# is the Sendmail-compatible mail queue listing command. -# -mailq_path = /usr/bin/mailq.postfix - -# setgid_group: The group for mail submission and queue management -# commands. This must be a group name with a numerical group ID that -# is not shared with other accounts, not even with the Postfix account. -# -setgid_group = postdrop - -# html_directory: The location of the Postfix HTML documentation. -# -html_directory = no - -# manpage_directory: The location of the Postfix on-line manual pages. -# -manpage_directory = /usr/share/man - -# sample_directory: The location of the Postfix sample configuration files. -# This parameter is obsolete as of Postfix 2.1. -# -sample_directory = /usr/share/doc/postfix-2.4.5/samples - -# readme_directory: The location of the Postfix README files. -# -readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES - -# add this to new postfix to get it to add proper message-id and other -# headers to outgoing emails via the gateway. - - -message_size_limit = 20971520 -inet_protocols = ipv4 -smtp_address_preference = ipv4 - - -# This has to be set in newer postfix 3.3.0 or later or it will refuse to -# send any email. ;( -smtpd_recipient_restrictions = permit_mynetworks, reject_unauth_destination diff --git a/roles/base/files/postfix/main.cf/main.cf.kojibuilder_iad2 b/roles/base/files/postfix/main.cf/main.cf.kojibuilder_iad2 deleted file mode 100644 index 7fb1af560d..0000000000 --- a/roles/base/files/postfix/main.cf/main.cf.kojibuilder_iad2 +++ /dev/null @@ -1,691 +0,0 @@ -# "false" -# Global Postfix configuration file. This file lists only a subset -# of all parameters. For the syntax, and for a complete parameter -# list, see the postconf(5) manual page (command: "man 5 postconf"). -# -# For common configuration examples, see BASIC_CONFIGURATION_README -# and STANDARD_CONFIGURATION_README. To find these documents, use -# the command "postconf html_directory readme_directory", or go to -# http://www.postfix.org/. -# -# For best results, change no more than 2-3 parameters at a time, -# and test if Postfix still works after every change. - -# SOFT BOUNCE -# -# The soft_bounce parameter provides a limited safety net for -# testing. When soft_bounce is enabled, mail will remain queued that -# would otherwise bounce. This parameter disables locally-generated -# bounces, and prevents the SMTP server from rejecting mail permanently -# (by changing 5xx replies into 4xx replies). However, soft_bounce -# is no cure for address rewriting mistakes or mail routing mistakes. -# -#soft_bounce = no - -# LOCAL PATHNAME INFORMATION -# -# The queue_directory specifies the location of the Postfix queue. -# This is also the root directory of Postfix daemons that run chrooted. -# See the files in examples/chroot-setup for setting up Postfix chroot -# environments on different UNIX systems. -# -queue_directory = /var/spool/postfix - -# The command_directory parameter specifies the location of all -# postXXX commands. -# -command_directory = /usr/sbin - -# The daemon_directory parameter specifies the location of all Postfix -# daemon programs (i.e. programs listed in the master.cf file). This -# directory must be owned by root. -# -daemon_directory = /usr/libexec/postfix - -# QUEUE AND PROCESS OWNERSHIP -# -# The mail_owner parameter specifies the owner of the Postfix queue -# and of most Postfix daemon processes. Specify the name of a user -# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS -# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In -# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED -# USER. -# -mail_owner = postfix - -# The default_privs parameter specifies the default rights used by -# the local delivery agent for delivery to external file or command. -# These rights are used in the absence of a recipient user context. -# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. -# -#default_privs = nobody - -# INTERNET HOST AND DOMAIN NAMES -# -# The myhostname parameter specifies the internet hostname of this -# mail system. The default is to use the fully-qualified domain name -# from gethostname(). $myhostname is used as a default value for many -# other configuration parameters. -# -#myhostname = host.domain.tld -#myhostname = virtual.domain.tld - -# The mydomain parameter specifies the local internet domain name. -# The default is to use $myhostname minus the first component. -# $mydomain is used as a default value for many other configuration -# parameters. -# -#mydomain = domain.tld - -# SENDING MAIL -# -# The myorigin parameter specifies the domain that locally-posted -# mail appears to come from. The default is to append $myhostname, -# which is fine for small sites. If you run a domain with multiple -# machines, you should (1) change this to $mydomain and (2) set up -# a domain-wide alias database that aliases each user to -# user@that.users.mailhost. -# -# For the sake of consistency between sender and recipient addresses, -# myorigin also specifies the default domain name that is appended -# to recipient addresses that have no @domain part. -# -#myorigin = $myhostname -#myorigin = $mydomain - -mydomain = fedoraproject.org -myorigin = fedoraproject.org - -# RECEIVING MAIL - -# The inet_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on. By default, -# the software claims all active interfaces on the machine. The -# parameter also controls delivery of mail to user@[ip.address]. -# -# See also the proxy_interfaces parameter, for network addresses that -# are forwarded to us via a proxy or network address translator. -# -# Note: you need to stop/start Postfix when this parameter changes. -# -#inet_interfaces = all -#inet_interfaces = $myhostname -#inet_interfaces = $myhostname, localhost -inet_interfaces = all - -# The proxy_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on by way of a -# proxy or network address translation unit. This setting extends -# the address list specified with the inet_interfaces parameter. -# -# You must specify your proxy/NAT addresses when your system is a -# backup MX host for other domains, otherwise mail delivery loops -# will happen when the primary MX host is down. -# -#proxy_interfaces = -#proxy_interfaces = 1.2.3.4 - -# The mydestination parameter specifies the list of domains that this -# machine considers itself the final destination for. -# -# These domains are routed to the delivery agent specified with the -# local_transport parameter setting. By default, that is the UNIX -# compatible delivery agent that lookups all recipients in /etc/passwd -# and /etc/aliases or their equivalent. -# -# The default is $myhostname + localhost.$mydomain. On a mail domain -# gateway, you should also include $mydomain. -# -# Do not specify the names of virtual domains - those domains are -# specified elsewhere (see VIRTUAL_README). -# -# Do not specify the names of domains that this machine is backup MX -# host for. Specify those names via the relay_domains settings for -# the SMTP server, or use permit_mx_backup if you are lazy (see -# STANDARD_CONFIGURATION_README). -# -# The local machine is always the final destination for mail addressed -# to user@[the.net.work.address] of an interface that the mail system -# receives mail on (see the inet_interfaces parameter). -# -# Specify a list of host or domain names, /file/name or type:table -# patterns, separated by commas and/or whitespace. A /file/name -# pattern is replaced by its contents; a type:table is matched when -# a name matches a lookup key (the right-hand side is ignored). -# Continue long lines by starting the next line with whitespace. -# -# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". -# -mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost -#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain -#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, -# mail.$mydomain, www.$mydomain, ftp.$mydomain - -# REJECTING MAIL FOR UNKNOWN LOCAL USERS -# -# The local_recipient_maps parameter specifies optional lookup tables -# with all names or addresses of users that are local with respect -# to $mydestination, $inet_interfaces or $proxy_interfaces. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown local users. This parameter is defined by default. -# -# To turn off local recipient checking in the SMTP server, specify -# local_recipient_maps = (i.e. empty). -# -# The default setting assumes that you use the default Postfix local -# delivery agent for local delivery. You need to update the -# local_recipient_maps setting if: -# -# - You define $mydestination domain recipients in files other than -# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. -# For example, you define $mydestination domain recipients in -# the $virtual_mailbox_maps files. -# -# - You redefine the local delivery agent in master.cf. -# -# - You redefine the "local_transport" setting in main.cf. -# -# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" -# feature of the Postfix local delivery agent (see local(8)). -# -# Details are described in the LOCAL_RECIPIENT_README file. -# -# Beware: if the Postfix SMTP server runs chrooted, you probably have -# to access the passwd file via the proxymap service, in order to -# overcome chroot restrictions. The alternative, having a copy of -# the system passwd file in the chroot jail is just not practical. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify a bare username, an @domain.tld -# wild-card, or specify a user@domain.tld address. -# -#local_recipient_maps = unix:passwd.byname $alias_maps -#local_recipient_maps = proxy:unix:passwd.byname $alias_maps -#local_recipient_maps = - -# The unknown_local_recipient_reject_code specifies the SMTP server -# response code when a recipient domain matches $mydestination or -# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty -# and the recipient address or address local-part is not found. -# -# The default setting is 550 (reject mail) but it is safer to start -# with 450 (try again later) until you are certain that your -# local_recipient_maps settings are OK. -# -unknown_local_recipient_reject_code = 550 - -# TRUST AND RELAY CONTROL - -# The mynetworks parameter specifies the list of "trusted" SMTP -# clients that have more privileges than "strangers". -# -# In particular, "trusted" SMTP clients are allowed to relay mail -# through Postfix. See the smtpd_recipient_restrictions parameter -# in postconf(5). -# -# You can specify the list of "trusted" network addresses by hand -# or you can let Postfix do it for you (which is the default). -# -# By default (mynetworks_style = subnet), Postfix "trusts" SMTP -# clients in the same IP subnetworks as the local machine. -# On Linux, this does works correctly only with interfaces specified -# with the "ifconfig" command. -# -# Specify "mynetworks_style = class" when Postfix should "trust" SMTP -# clients in the same IP class A/B/C networks as the local machine. -# Don't do this with a dialup site - it would cause Postfix to "trust" -# your entire provider's network. Instead, specify an explicit -# mynetworks list by hand, as described below. -# -# Specify "mynetworks_style = host" when Postfix should "trust" -# only the local machine. -# -#mynetworks_style = class -#mynetworks_style = subnet -#mynetworks_style = host - -# Alternatively, you can specify the mynetworks list by hand, in -# which case Postfix ignores the mynetworks_style setting. -# -# Specify an explicit list of network/netmask patterns, where the -# mask specifies the number of bits in the network part of a host -# address. -# -# You can also specify the absolute pathname of a pattern file instead -# of listing the patterns here. Specify type:table for table-based lookups -# (the value on the table right-hand side is not used). -# -#mynetworks = 168.100.189.0/28, 127.0.0.0/8 -#mynetworks = $config_directory/mynetworks -#mynetworks = hash:/etc/postfix/network_table - - -# The relay_domains parameter restricts what destinations this system will -# relay mail to. See the smtpd_recipient_restrictions description in -# postconf(5) for detailed information. -# -# By default, Postfix relays mail -# - from "trusted" clients (IP address matches $mynetworks) to any destination, -# - from "untrusted" clients to destinations that match $relay_domains or -# subdomains thereof, except addresses with sender-specified routing. -# The default relay_domains value is $mydestination. -# -# In addition to the above, the Postfix SMTP server by default accepts mail -# that Postfix is final destination for: -# - destinations that match $inet_interfaces or $proxy_interfaces, -# - destinations that match $mydestination -# - destinations that match $virtual_alias_domains, -# - destinations that match $virtual_mailbox_domains. -# These destinations do not need to be listed in $relay_domains. -# -# Specify a list of hosts or domains, /file/name patterns or type:name -# lookup tables, separated by commas and/or whitespace. Continue -# long lines by starting the next line with whitespace. A file name -# is replaced by its contents; a type:name table is matched when a -# (parent) domain appears as lookup key. -# -# NOTE: Postfix will not automatically forward mail for domains that -# list this system as their primary or backup MX host. See the -# permit_mx_backup restriction description in postconf(5). -# -#relay_domains = $mydestination - - - -# INTERNET OR INTRANET - -# The relayhost parameter specifies the default host to send mail to -# when no entry is matched in the optional transport(5) table. When -# no relayhost is given, mail is routed directly to the destination. -# -# On an intranet, specify the organizational domain name. If your -# internal DNS uses no MX records, specify the name of the intranet -# gateway host instead. -# -# In the case of SMTP, specify a domain, host, host:port, [host]:port, -# [address] or [address]:port; the form [host] turns off MX lookups. -# -# If you're connected via UUCP, see also the default_transport parameter. -# -#relayhost = $mydomain -#relayhost = [gateway.my.domain] -#relayhost = [mailserver.isp.tld] -#relayhost = uucphost -#relayhost = [an.ip.add.ress] -relayhost = bastion.iad2.fedoraproject.org - - -# REJECTING UNKNOWN RELAY USERS -# -# The relay_recipient_maps parameter specifies optional lookup tables -# with all addresses in the domains that match $relay_domains. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown relay users. This feature is off by default. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify an @domain.tld wild-card, or specify -# a user@domain.tld address. -# -#relay_recipient_maps = hash:/etc/postfix/relay_recipients - -# INPUT RATE CONTROL -# -# The in_flow_delay configuration parameter implements mail input -# flow control. This feature is turned on by default, although it -# still needs further development (it's disabled on SCO UNIX due -# to an SCO bug). -# -# A Postfix process will pause for $in_flow_delay seconds before -# accepting a new message, when the message arrival rate exceeds the -# message delivery rate. With the default 100 SMTP server process -# limit, this limits the mail inflow to 100 messages a second more -# than the number of messages delivered per second. -# -# Specify 0 to disable the feature. Valid delays are 0..10. -# -#in_flow_delay = 1s - -# ADDRESS REWRITING -# -# The ADDRESS_REWRITING_README document gives information about -# address masquerading or other forms of address rewriting including -# username->Firstname.Lastname mapping. - -masquerade_domains = redhat.com -masquerade_exceptions = root apache - -# ADDRESS REDIRECTION (VIRTUAL DOMAIN) -# -# The VIRTUAL_README document gives information about the many forms -# of domain hosting that Postfix supports. - -# "USER HAS MOVED" BOUNCE MESSAGES -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# TRANSPORT MAP -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# ALIAS DATABASE -# -# The alias_maps parameter specifies the list of alias databases used -# by the local delivery agent. The default list is system dependent. -# -# On systems with NIS, the default is to search the local alias -# database, then the NIS alias database. See aliases(5) for syntax -# details. -# -# If you change the alias database, run "postalias /etc/aliases" (or -# wherever your system stores the mail alias file), or simply run -# "newaliases" to build the necessary DBM or DB file. -# -# It will take a minute or so before changes become visible. Use -# "postfix reload" to eliminate the delay. -# -#alias_maps = dbm:/etc/aliases -alias_maps = hash:/etc/aliases -#alias_maps = hash:/etc/aliases, nis:mail.aliases -#alias_maps = netinfo:/aliases - -# The alias_database parameter specifies the alias database(s) that -# are built with "newaliases" or "sendmail -bi". This is a separate -# configuration parameter, because alias_maps (see above) may specify -# tables that are not necessarily all under control by Postfix. -# -#alias_database = dbm:/etc/aliases -#alias_database = dbm:/etc/mail/aliases -alias_database = hash:/etc/aliases -#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases - -# ADDRESS EXTENSIONS (e.g., user+foo) -# -# The recipient_delimiter parameter specifies the separator between -# user names and address extensions (user+foo). See canonical(5), -# local(8), relocated(5) and virtual(5) for the effects this has on -# aliases, canonical, virtual, relocated and .forward file lookups. -# Basically, the software tries user+foo and .forward+foo before -# trying user and .forward. -# -recipient_delimiter = + - -# DELIVERY TO MAILBOX -# -# The home_mailbox parameter specifies the optional pathname of a -# mailbox file relative to a user's home directory. The default -# mailbox file is /var/spool/mail/user or /var/mail/user. Specify -# "Maildir/" for qmail-style delivery (the / is required). -# -#home_mailbox = Mailbox -#home_mailbox = Maildir/ - -# The mail_spool_directory parameter specifies the directory where -# UNIX-style mailboxes are kept. The default setting depends on the -# system type. -# -#mail_spool_directory = /var/mail -#mail_spool_directory = /var/spool/mail - -# The mailbox_command parameter specifies the optional external -# command to use instead of mailbox delivery. The command is run as -# the recipient with proper HOME, SHELL and LOGNAME environment settings. -# Exception: delivery for root is done as $default_user. -# -# Other environment variables of interest: USER (recipient username), -# EXTENSION (address extension), DOMAIN (domain part of address), -# and LOCAL (the address localpart). -# -# Unlike other Postfix configuration parameters, the mailbox_command -# parameter is not subjected to $parameter substitutions. This is to -# make it easier to specify shell syntax (see example below). -# -# Avoid shell meta characters because they will force Postfix to run -# an expensive shell process. Procmail alone is expensive enough. -# -# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN -# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. -# -#mailbox_command = /usr/bin/procmail -#mailbox_command = /some/where/procmail -a "$EXTENSION" - -# The mailbox_transport specifies the optional transport in master.cf -# to use after processing aliases and .forward files. This parameter -# has precedence over the mailbox_command, fallback_transport and -# luser_relay parameters. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp - -# If using the cyrus-imapd IMAP server deliver local mail to the IMAP -# server using LMTP (Local Mail Transport Protocol), this is prefered -# over the older cyrus deliver program by setting the -# mailbox_transport as below: -# -# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp -# -# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via -# these settings. -# -# local_destination_recipient_limit = 300 -# local_destination_concurrency_limit = 5 -# -# Of course you should adjust these settings as appropriate for the -# capacity of the hardware you are using. The recipient limit setting -# can be used to take advantage of the single instance message store -# capability of Cyrus. The concurrency limit can be used to control -# how many simultaneous LMTP sessions will be permitted to the Cyrus -# message store. -# -# To use the old cyrus deliver program you have to set: -#mailbox_transport = cyrus - -# The fallback_transport specifies the optional transport in master.cf -# to use for recipients that are not found in the UNIX passwd database. -# This parameter has precedence over the luser_relay parameter. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp -#fallback_transport = - -#transport_maps = hash:/etc/postfix/transport -# The luser_relay parameter specifies an optional destination address -# for unknown recipients. By default, mail for unknown@$mydestination, -# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned -# as undeliverable. -# -# The following expansions are done on luser_relay: $user (recipient -# username), $shell (recipient shell), $home (recipient home directory), -# $recipient (full recipient address), $extension (recipient address -# extension), $domain (recipient domain), $local (entire recipient -# localpart), $recipient_delimiter. Specify ${name?value} or -# ${name:value} to expand value only when $name does (does not) exist. -# -# luser_relay works only for the default Postfix local delivery agent. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must specify "local_recipient_maps =" (i.e. empty) in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#luser_relay = $user@other.host -#luser_relay = $local@other.host -#luser_relay = admin+$local - -# JUNK MAIL CONTROLS -# -# The controls listed here are only a very small subset. The file -# SMTPD_ACCESS_README provides an overview. - -# The header_checks parameter specifies an optional table with patterns -# that each logical message header is matched against, including -# headers that span multiple physical lines. -# -# By default, these patterns also apply to MIME headers and to the -# headers of attached messages. With older Postfix versions, MIME and -# attached message headers were treated as body text. -# -# For details, see "man header_checks". -# -header_checks = regexp:/etc/postfix/header_checks - -# FAST ETRN SERVICE -# -# Postfix maintains per-destination logfiles with information about -# deferred mail, so that mail can be flushed quickly with the SMTP -# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". -# See the ETRN_README document for a detailed description. -# -# The fast_flush_domains parameter controls what destinations are -# eligible for this service. By default, they are all domains that -# this server is willing to relay mail to. -# -#fast_flush_domains = $relay_domains - -# SHOW SOFTWARE VERSION OR NOT -# -# The smtpd_banner parameter specifies the text that follows the 220 -# code in the SMTP server's greeting banner. Some people like to see -# the mail version advertised. By default, Postfix shows no version. -# -# You MUST specify $myhostname at the start of the text. That is an -# RFC requirement. Postfix itself does not care. -# -#smtpd_banner = $myhostname ESMTP $mail_name -#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) - -# PARALLEL DELIVERY TO THE SAME DESTINATION -# -# How many parallel deliveries to the same user or domain? With local -# delivery, it does not make sense to do massively parallel delivery -# to the same user, because mailbox updates must happen sequentially, -# and expensive pipelines in .forward files can cause disasters when -# too many are run at the same time. With SMTP deliveries, 10 -# simultaneous connections to the same domain could be sufficient to -# raise eyebrows. -# -# Each message delivery transport has its XXX_destination_concurrency_limit -# parameter. The default is $default_destination_concurrency_limit for -# most delivery transports. For the local delivery agent the default is 2. - -#local_destination_concurrency_limit = 2 -#default_destination_concurrency_limit = 20 - -# DEBUGGING CONTROL -# -# The debug_peer_level parameter specifies the increment in verbose -# logging level when an SMTP client or server host name or address -# matches a pattern in the debug_peer_list parameter. -# -debug_peer_level = 2 - -# The debug_peer_list parameter specifies an optional list of domain -# or network patterns, /file/name patterns or type:name tables. When -# an SMTP client or server host name or address matches a pattern, -# increase the verbose logging level by the amount specified in the -# debug_peer_level parameter. -# -#debug_peer_list = 127.0.0.1 -#debug_peer_list = some.domain - -# The debugger_command specifies the external command that is executed -# when a Postfix daemon program is run with the -D option. -# -# Use "command .. & sleep 5" so that the debugger can attach before -# the process marches on. If you use an X-based debugger, be sure to -# set up your XAUTHORITY environment variable before starting Postfix. -# -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - xxgdb $daemon_directory/$process_name $process_id & sleep 5 - -# If you can't use X, use this to capture the call stack when a -# daemon crashes. The result is in a file in the configuration -# directory, and is named after the process name and the process ID. -# -# debugger_command = -# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; -# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 -# >$config_directory/$process_name.$process_id.log & sleep 5 -# -# Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r -# " where uniquely matches one of the detached -# sessions (from "screen -list"). -# -# debugger_command = -# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen -# -dmS $process_name gdb $daemon_directory/$process_name -# $process_id & sleep 1 - -# INSTALL-TIME CONFIGURATION INFORMATION -# -# The following parameters are used when installing a new Postfix version. -# -# sendmail_path: The full pathname of the Postfix sendmail command. -# This is the Sendmail-compatible mail posting interface. -# -sendmail_path = /usr/sbin/sendmail.postfix - -# newaliases_path: The full pathname of the Postfix newaliases command. -# This is the Sendmail-compatible command to build alias databases. -# -newaliases_path = /usr/bin/newaliases.postfix - -# mailq_path: The full pathname of the Postfix mailq command. This -# is the Sendmail-compatible mail queue listing command. -# -mailq_path = /usr/bin/mailq.postfix - -# setgid_group: The group for mail submission and queue management -# commands. This must be a group name with a numerical group ID that -# is not shared with other accounts, not even with the Postfix account. -# -setgid_group = postdrop - -# html_directory: The location of the Postfix HTML documentation. -# -html_directory = no - -# manpage_directory: The location of the Postfix on-line manual pages. -# -manpage_directory = /usr/share/man - -# sample_directory: The location of the Postfix sample configuration files. -# This parameter is obsolete as of Postfix 2.1. -# -sample_directory = /usr/share/doc/postfix-2.4.5/samples - -# readme_directory: The location of the Postfix README files. -# -readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES - -# add this to new postfix to get it to add proper message-id and other -# headers to outgoing emails via the gateway. - - -message_size_limit = 20971520 -inet_protocols = ipv4 - -# This has to be set in newer postfix 3.3.0 or later or it will refuse to -# send any email. ;( -smtpd_recipient_restrictions = permit_mynetworks, reject_unauth_destination diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.iad2.fedoraproject.org b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.rdu3.fedoraproject.org similarity index 99% rename from roles/base/files/postfix/main.cf/main.cf.mailman01.stg.iad2.fedoraproject.org rename to roles/base/files/postfix/main.cf/main.cf.mailman01.stg.rdu3.fedoraproject.org index 7b9a83b90e..ecd01cadc5 100644 --- a/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.iad2.fedoraproject.org +++ b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.rdu3.fedoraproject.org @@ -315,7 +315,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.iad2.fedoraproject.org +relayhost = bastion.rdu3.fedoraproject.org # REJECTING UNKNOWN RELAY USERS diff --git a/roles/base/files/postfix/transports.gateway b/roles/base/files/postfix/transports.gateway index a1eea484a8..166f364c38 100644 --- a/roles/base/files/postfix/transports.gateway +++ b/roles/base/files/postfix/transports.gateway @@ -302,6 +302,6 @@ fedora.redhat.com : redhat.com smtp:[mx1.redhat.com] .redhat.com smtp:[mx1.redhat.com] ceylon-lang.org smtp:[mx1.redhat.com] -lists.stg.fedoraproject.org smtp:[mailman01.stg.iad2.fedoraproject.org] -lists.stg.fedorahosted.org smtp:[mailman01.stg.iad2.fedoraproject.org] -lists.stg.pagure.io smtp:[mailman01.stg.iad2.fedoraproject.org] +lists.stg.fedoraproject.org smtp:[mailman01.stg.rdu3.fedoraproject.org] +lists.stg.fedorahosted.org smtp:[mailman01.stg.rdu3.fedoraproject.org] +lists.stg.pagure.io smtp:[mailman01.stg.rdu3.fedoraproject.org] diff --git a/roles/base/files/rsyslog/rsyslog.conf.log01.iad2.fedoraproject.org b/roles/base/files/rsyslog/rsyslog.conf.log01.iad2.fedoraproject.org deleted file mode 100644 index 9aec6fa03a..0000000000 --- a/roles/base/files/rsyslog/rsyslog.conf.log01.iad2.fedoraproject.org +++ /dev/null @@ -1,236 +0,0 @@ -################################################################################ -# RSYSLOG.CONF - central logging server # -################################################################################ -# N O T E # -#------------------------------------------------------------------------------# -# This rsyslog configuration is suitable for a central log host. This is not # -# intended for a normal server. # -# # -# This config was built and tested for rsyslog version rsyslog-2.0.0. # -################################################################################ - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# M O D U L E S # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -$ModLoad immark.so # mark messages -$MarkMessagePeriod 1200 # every 20 minutes -$ModLoad imudp.so #udp sockets -$ModLoad imtcp.so #tcp socks -$ModLoad imuxsock # local syslog() listener -#$ModLoad imklog # local klog logging -$ModLoad imjournal # provides access to the systemd journal - - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# G L O B A L S E T T I N G S # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -$umask 0000 -$CreateDirs on -$DirCreateMode 0755 -$FileCreateMode 0644 -$FileOwner root -$FileGroup root -$RepeatedMsgReduction on -$EscapeControlCharactersOnReceive off -$UDPServerRun 514 -$InputTCPMaxSessions 2000 -$InputTCPServerRun 514 -$InputTCPServerRun 5000 -$IMUXSockRateLimitInterval 0 -$SystemLogRateLimitInterval 0 -$WorkDirectory /var/lib/rsyslog -$IMJournalStateFile imjournal.state -$MaxOpenFiles 131072 - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# T E M P L A T E S # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# - -$template CustomFormat,"%TIMESTAMP% %FROMHOST% %HOSTNAME% %syslogtag%%msg%\n" -$template TraditionalFormat,"%timegenerated% %HOSTNAME% %syslogtag%%msg%\n" -$template MergeFormat,"%timegenerated% %FROMHOST% %syslogtag%%msg%\n" -$template RawMessage,"%msg:2:2048%\n" - - -#------------------------------------------------------------------------------# -# templates for merged remote logging # -#------------------------------------------------------------------------------# -$template m_messages, "/var/log/merged/messages.log" -$template m_secure, "/var/log/merged/secure.log" -$template m_mail, "/var/log/merged/mail.log" -$template m_cron, "/var/log/merged/cron.log" -$template m_spooler, "/var/log/merged/spooler.log" -$template m_boot, "/var/log/merged/boot.log" -$template m_kern, "/var/log/merged/kernel.log" -$template m_audit, "/var/log/merged/audit.log" -$template m_http_error, "/var/log/merged/http_error.log" -$template m_http_apps, "/var/log/merged/apps.log" - -#------------------------------------------------------------------------------# -# templates for remote logging # -#------------------------------------------------------------------------------# -$template r_messages, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/messages.log" -$template r_secure, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/secure.log" -$template r_mail, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/mail.log" -$template r_cron, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/cron.log" -$template r_spooler, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/spooler.log" -$template r_boot, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/boot.log" -$template r_kern, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/kernel.log" -$template r_audit, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/audit.log" -$template r_http_error, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/http_error.log" -$template r_http_apps, "/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/apps.log" - -#------------------------------------------------------------------------------# -# templates for http logging # -#------------------------------------------------------------------------------# -$template HttpAccessTemplate,"/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/http/%APP-NAME%" -$template HttpErrorTemplate,"/var/log/hosts/%FROMHOST%/%$YEAR%/%$MONTH%/%$DAY%/http/%APP-NAME%" - -#------------------------------------------------------------------------------# -# templates for local logging # -#------------------------------------------------------------------------------# -$template l_messages, "/var/log/messages" -$template l_secure, "/var/log/secure" -$template l_mail, "/var/log/maillog" -$template l_cron, "/var/log/cron" -$template l_spooler, "/var/log/spooler" -$template l_boot, "/var/log/boot.log" -$template l_idgaud, "/var/log/idgaudit.log" -$template l_idgsys, "/var/log/idgsystem.log" - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# R E M O T E L O G G I N G # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# - -#------------------------------------------------------------------------------# -# remote messages log # -#------------------------------------------------------------------------------# -*.info;mail.none;authpriv.none;cron.none;local6.none;local5.none;local4.none ?r_messages;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote auth/secure log # -#------------------------------------------------------------------------------# -authpriv.* -?r_secure;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote mail log # -#------------------------------------------------------------------------------# -mail.* -?r_mail;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote cron log # -#------------------------------------------------------------------------------# -cron.* ?r_cron;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote spool log # -#------------------------------------------------------------------------------# -uucp,news.crit ?r_spooler;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote audit log # -#------------------------------------------------------------------------------# -local6.* ?r_audit;TraditionalFormat - - -#------------------------------------------------------------------------------# -# remote http_error log # -#------------------------------------------------------------------------------# -local5.* ?r_http_error;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote http app log # -#------------------------------------------------------------------------------# -local4.* ?r_http_apps;TraditionalFormat - - -#------------------------------------------------------------------------------# -# remote boot log # -#------------------------------------------------------------------------------# -local7.* ?r_boot;TraditionalFormat - -#------------------------------------------------------------------------------# -# remote kernel log # -#------------------------------------------------------------------------------# -kern.* ?r_kern;TraditionalFormat - - - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# MERGED R E M O T E L O G G I N G # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# - - $DefaultNetstreamDriverCAFile /etc/pki/tls/certs/2022-IT-Root-CA.pem - *.* action( - type="omfwd" - target="10.31.20.44" - port="6514" - protocol="tcp" - queue.filename="fwdRule1" # unique name prefix for spool files - queue.maxdiskspace="1g" # 1gb space limit (use as much as possible) - queue.saveonshutdown="on" # save messages to disk on shutdown - queue.type="LinkedList" # run asynchronously - queue.size="500000" - action.resumeRetryCount="10" # 10 retries if host is down - StreamDriver="gtls" - StreamDriverMode="1" - StreamDriverAuthMode="anon" # not authenticated - ) - - - -#------------------------------------------------------------------------------# -# remote messages log # -#------------------------------------------------------------------------------# -*.info;mail.none;authpriv.none;cron.none;local6.none;local5.none;local4.none ?m_messages;MergeFormat - -#------------------------------------------------------------------------------# -# remote auth/secure log # -#------------------------------------------------------------------------------# -authpriv.* -?m_secure;MergeFormat - -#------------------------------------------------------------------------------# -# remote mail log # -#------------------------------------------------------------------------------# -mail.* -?m_mail;MergeFormat - -#------------------------------------------------------------------------------# -# remote cron log # -#------------------------------------------------------------------------------# -cron.* ?m_cron;MergeFormat - -#------------------------------------------------------------------------------# -# remote spool log # -#------------------------------------------------------------------------------# -uucp,news.crit ?m_spooler;MergeFormat - - -#------------------------------------------------------------------------------# -# remote boot log # -#------------------------------------------------------------------------------# -local7.* ?m_boot;MergeFormat - -#------------------------------------------------------------------------------# -# remote kernel log # -#------------------------------------------------------------------------------# -kern.* ?m_kern;MergeFormat - -#------------------------------------------------------------------------------# -# remote http_error -#------------------------------------------------------------------------------# -local5.* ?m_http_error;MergeFormat - -#------------------------------------------------------------------------------# -# remote http_apps -#------------------------------------------------------------------------------# -local4.* ?m_http_apps;MergeFormat - - -#------------------------------------------------------------------------------# -# remote audit log # -#------------------------------------------------------------------------------# -#this means: if log message does not contain 'type=AVC' then drop it -# this is only for the merged logs from auditd -:msg, !contains, "type=AVC" ~ -local6.* ?m_audit;MergeFormat - diff --git a/roles/base/files/setprodiad2ps1.sh b/roles/base/files/setprodiad2ps1.sh deleted file mode 100644 index 678b953a7e..0000000000 --- a/roles/base/files/setprodiad2ps1.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Set PS1 based on env -# -[[ $- =~ i ]] && PS1="[\u@\h \W]\[$(tput setaf 3)\][PROD-IAD2]\[$(tput sgr0)\]\\$ \[\]" diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 2cede5fff8..7dd4aeabfe 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -180,7 +180,7 @@ - base - iptables - blocklist - when: "'iad2' not in inventory_hostname or (external is defined and external | bool)" + when: "'rdu3' not in inventory_hostname or (external is defined and external | bool)" - name: Setup blocklist update cron job cron: @@ -189,7 +189,7 @@ minute: 15 hour: "*/2" job: "/usr/local/bin/blocklist-update.sh force >& /dev/null" - when: "'iad2' not in inventory_hostname or (external is defined and external | bool)" + when: "'rdu3' not in inventory_hostname or (external is defined and external | bool)" tags: - base - iptables @@ -577,22 +577,7 @@ owner=root group=root mode=0644 - when: env == 'production' and ( datacenter != 'iad2' and datacenter != 'rdu3' ) - tags: - - base - - config - - prompt - -# Set PS1 to show prod-iad2 environment at PS1 -# -- name: Set PS1 for prod in /etc/profile.d - ansible.builtin.copy: > - src=setprodiad2ps1.sh - dest="/etc/profile.d/setprodiad2ps1.sh" - owner=root - group=root - mode=0644 - when: env == 'production' and datacenter == 'iad2' + when: env == 'production' and datacenter != 'rdu3' tags: - base - config diff --git a/roles/base/templates/ifcfg.j2 b/roles/base/templates/ifcfg.j2 index c6c578f3b2..7e45e97fab 100644 --- a/roles/base/templates/ifcfg.j2 +++ b/roles/base/templates/ifcfg.j2 @@ -10,10 +10,10 @@ OPTIONS="layer2=1 portno=0" DEFROUTE=yes GATEWAY="{{ gw }}" {% endif %} -{% if hostvars[inventory_hostname].datacenter == 'iad2' and env == 'production' %} -DOMAIN="iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org" -{% elif hostvars[inventory_hostname].datacenter == 'iad2' and env == 'staging' %} -DOMAIN="stg.iad2.fedoraproject.org iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org" +{% if hostvars[inventory_hostname].datacenter == 'rdu3' and env == 'production' %} +DOMAIN="rdu3.fedoraproject.org vpn.fedoraproject.org fedoraproject.org" +{% elif hostvars[inventory_hostname].datacenter == 'rdu3' and env == 'staging' %} +DOMAIN="stg.rdu3.fedoraproject.org rdu3.fedoraproject.org vpn.fedoraproject.org fedoraproject.org" {% else %} DOMAIN="vpn.fedoraproject.org fedoraproject.org" {% endif %} diff --git a/roles/base/templates/iptables/iptables b/roles/base/templates/iptables/iptables index 6a537c48c4..47e49f3ae8 100644 --- a/roles/base/templates/iptables/iptables +++ b/roles/base/templates/iptables/iptables @@ -21,31 +21,31 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.166.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.16 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.15 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.166.10 -j ACCEPT # zabbix01 -A INPUT -p tcp -m tcp --dport 10051 -j ACCEPT --A INPUT -p tcp -m tcp --dport 10050 -s 10.3.163.198 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 10050 -s 10.16.163.198 -j ACCEPT -{% if env != 'staging' and datacenter == 'iad2' and inventory_hostname not in groups['staging_friendly'] %} +{% if env != 'staging' and datacenter == 'rdu3' and inventory_hostname not in groups['staging_friendly'] %} # -# In the iad2 datacenter, both production and staging hosts are in different +# In the rdu3 datacenter, both production and staging hosts are in different # vlans, and different subnets. However, just as a precaution, we want prod machines to # reject connections from any staging host just in case there's some globally enabled port. # There are however a few hosts in production we have marked 'staging-friendly' # that we do allow staging to talk to for mostly read-only data they need. # --A INPUT -s 10.3.166.0/24 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.3.167.0/24 -j REJECT --reject-with icmp-host-prohibited +-A INPUT -s 10.16.166.0/24 -j REJECT --reject-with icmp-host-prohibited +-A INPUT -s 10.16.167.0/24 -j REJECT --reject-with icmp-host-prohibited {% endif %} {% if vpn %} # # We want to have all vpn hosts reject most things from the 'less secure' vpn network # -{% if inventory_hostname == 'log01.iad2.fedoraproject.org' %} +{% if inventory_hostname == 'log01.rdu3.fedoraproject.org' %} # Allow all vpn hosts to talk to the log server for rsyslog -A INPUT -s 192.168.100.0/24 -m tcp -p tcp --dport 514 -j ACCEPT -A INPUT -s 192.168.100.0/24 -m udp -p udp --dport 25826 -j ACCEPT @@ -92,7 +92,7 @@ {% endif %} {% endfor %} # nagios --A INPUT -p tcp -m tcp --dport {{ port }} --src 10.3.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport {{ port }} --src 10.16.163.10 -j ACCEPT {% endfor %} {% endif %} diff --git a/roles/base/templates/iptables/iptables.bastion b/roles/base/templates/iptables/iptables.bastion index eb67800d7b..76b784da63 100644 --- a/roles/base/templates/iptables/iptables.bastion +++ b/roles/base/templates/iptables/iptables.bastion @@ -21,31 +21,31 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.166.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.16 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.15 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.166.10 -j ACCEPT # zabbix01 -A INPUT -p tcp -m tcp --dport 10051 -j ACCEPT --A INPUT -p tcp -m tcp --dport 10050 -s 10.3.163.198 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 10050 -s 10.16.163.198 -j ACCEPT -{% if env != 'staging' and datacenter == 'iad2' and inventory_hostname not in groups['staging_friendly'] %} +{% if env != 'staging' and datacenter == 'rdu3' and inventory_hostname not in groups['staging_friendly'] %} # -# In the iad2 datacenter, both production and staging hosts are in different +# In the rdu3 datacenter, both production and staging hosts are in different # vlans, and different subnets. However, just as a precaution, we want prod machines to # reject connections from any staging host just in case there's some globally enabled port. # There are however a few hosts in production we have marked 'staging-friendly' # that we do allow staging to talk to for mostly read-only data they need. # --A INPUT -s 10.3.166.0/24 -j REJECT --reject-with icmp-host-prohibited --A INPUT -s 10.3.167.0/24 -j REJECT --reject-with icmp-host-prohibited +-A INPUT -s 10.16.166.0/24 -j REJECT --reject-with icmp-host-prohibited +-A INPUT -s 10.16.167.0/24 -j REJECT --reject-with icmp-host-prohibited {% endif %} {% if vpn %} # # We want to have all vpn hosts reject most things from the 'less secure' vpn network # -{% if inventory_hostname == 'log01.iad2.fedoraproject.org' %} +{% if inventory_hostname == 'log01.rdu3.fedoraproject.org' %} # Allow all vpn hosts to talk to the log server for rsyslog -A INPUT -s 192.168.100.0/24 -m tcp -p tcp --dport 514 -j ACCEPT -A INPUT -s 192.168.100.0/24 -m udp -p udp --dport 25826 -j ACCEPT @@ -70,7 +70,7 @@ -A INPUT -s 192.168.100.0/24 -m tcp -p tcp --dport 25 -j ACCEPT -A INPUT -s 192.168.1.0/24 -m tcp -p tcp --dport 25 -j ACCEPT -A INPUT -s 192.168.0.0/24 -m tcp -p tcp --dport 25 -j ACCEPT --A INPUT -s 10.3.160.0/19 -m tcp -p tcp --dport 25 -j ACCEPT +-A INPUT -s 10.16.160.0/19 -m tcp -p tcp --dport 25 -j ACCEPT # s390x builders/virthost -A INPUT -s 10.1.102.0/24 -m tcp -p tcp --dport 25 -j ACCEPT # redhat mxes @@ -117,7 +117,7 @@ {% endif %} {% endfor %} # nagios --A INPUT -p tcp -m tcp --dport {{ port }} --src 10.3.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport {{ port }} --src 10.16.163.10 -j ACCEPT {% endfor %} {% endif %} diff --git a/roles/base/templates/iptables/iptables.kojibuilder b/roles/base/templates/iptables/iptables.kojibuilder index 8c1f036f42..f8225eeefe 100644 --- a/roles/base/templates/iptables/iptables.kojibuilder +++ b/roles/base/templates/iptables/iptables.kojibuilder @@ -38,36 +38,36 @@ -A OUTPUT -p tcp -m tcp -d 10.16.0.35 --dport 80 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.1.102.24 --dport 80 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.1.102.50 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.169.106 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.169.107 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.169.106 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.169.107 --dport 80 -j ACCEPT {% endif %} # tang for buildhw --A OUTPUT -p tcp -m tcp -d 10.3.163.37 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.38 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.37 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.38 --dport 80 -j ACCEPT # DNS --A OUTPUT -p udp -m udp -d 10.3.163.33 --dport 53 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.33 --dport 53 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.34 --dport 53 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.34 --dport 53 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.33 --dport 53 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.33 --dport 53 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.34 --dport 53 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.34 --dport 53 -j ACCEPT # bastion smtp --A OUTPUT -p tcp -m tcp -d 10.3.163.31 --dport 25 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.31 --dport 25 -j ACCEPT # infra.fp.o --A OUTPUT -p tcp -m tcp -d 10.3.163.35 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.35 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.35 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.35 --dport 443 -j ACCEPT # rsyslog out to log01 --A OUTPUT -p tcp -m tcp -d 10.3.163.39 --dport 514 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.39 --dport 514 -j ACCEPT # SSH --A INPUT -p tcp -m tcp -s 10.3.160.0/19 --dport 22 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.160.0/19 --sport 22 -j ACCEPT +-A INPUT -p tcp -m tcp -s 10.16.160.0/19 --dport 22 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.160.0/19 --sport 22 -j ACCEPT {% if inventory_hostname.startswith (('buildvm-s390x-11', 'buildvm-s390x-12', 'buildvm-s390x-13')) %} # Allow SSHFS binding to koji01 --A OUTPUT -p tcp -m tcp -d 10.3.169.104 --dport 22 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.169.104 --dport 22 -j ACCEPT {% endif %} # http to pull sources from pkgs lookaside @@ -78,104 +78,104 @@ # admin.fedoraproject.org for fas (proyx(1)01 and proxy(1)10) {% if host in groups['staging'] %} --A OUTPUT -p tcp -m tcp -d 10.3.166.74 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.74 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.75 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.75 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.74 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.74 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.75 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.75 --dport 443 -j ACCEPT {% endif %} --A OUTPUT -p tcp -m tcp -d 10.3.163.74 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.74 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.75 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.75 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.76 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.76 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.77 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.77 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.74 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.74 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.75 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.75 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.76 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.76 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.77 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.77 --dport 443 -j ACCEPT # ipa client ports {% if host in groups['staging'] %} --A OUTPUT -p tcp -m tcp -d 10.3.166.21 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.63 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.21 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.63 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.21 --dport 389 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.63 --dport 389 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.21 --dport 636 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.63 --dport 636 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.21 --dport 88 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.63 --dport 88 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.166.21 --dport 88 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.166.63 --dport 88 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.21 --dport 464 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.166.63 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.166.21 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.166.63 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.166.21 --dport 53 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.166.63 --dport 53 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.21 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.63 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.21 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.63 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.21 --dport 389 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.63 --dport 389 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.21 --dport 636 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.63 --dport 636 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.21 --dport 88 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.63 --dport 88 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.166.21 --dport 88 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.166.63 --dport 88 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.21 --dport 464 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.166.63 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.166.21 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.166.63 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.166.21 --dport 53 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.166.63 --dport 53 -j ACCEPT {% else %} --A OUTPUT -p tcp -m tcp -d 10.3.163.54 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.55 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.104 --dport 80 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.54 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.55 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.104 --dport 443 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.54 --dport 389 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.55 --dport 389 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.104 --dport 389 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.54 --dport 636 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.55 --dport 636 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.104 --dport 636 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.54 --dport 88 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.55 --dport 88 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.104 --dport 88 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.54 --dport 88 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.55 --dport 88 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.104 --dport 88 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.54 --dport 464 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.55 --dport 464 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.163.104 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.54 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.55 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.104 --dport 464 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.54 --dport 53 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.55 --dport 53 -j ACCEPT --A OUTPUT -p udp -m udp -d 10.3.163.104 --dport 53 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.54 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.55 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.104 --dport 80 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.54 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.55 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.104 --dport 443 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.54 --dport 389 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.55 --dport 389 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.104 --dport 389 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.54 --dport 636 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.55 --dport 636 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.104 --dport 636 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.54 --dport 88 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.55 --dport 88 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.104 --dport 88 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.54 --dport 88 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.55 --dport 88 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.104 --dport 88 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.54 --dport 464 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.55 --dport 464 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.163.104 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.54 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.55 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.104 --dport 464 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.54 --dport 53 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.55 --dport 53 -j ACCEPT +-A OUTPUT -p udp -m udp -d 10.16.163.104 --dport 53 -j ACCEPT {% endif %} {% if host in groups['staging'] %} # Allow nfs from koji01 --A INPUT -p tcp -m tcp -d 10.3.167.64 --dport 2049 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.167.64 --dport 2049 -j ACCEPT +-A INPUT -p tcp -m tcp -d 10.16.167.64 --dport 2049 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.167.64 --dport 2049 -j ACCEPT {% endif %} #nfs to vtap-fedora-nfs01.storage.phx2.redhat.com - a little to wide-open - but # kinda necessary --A INPUT -m tcp -p tcp -s 10.3.162.11 -j ACCEPT --A OUTPUT -m tcp -p tcp -d 10.3.162.11 -j ACCEPT --A INPUT -m udp -p udp -s 10.3.162.11 -j ACCEPT --A OUTPUT -m udp -p udp -d 10.3.162.11 -j ACCEPT --A INPUT -m tcp -p tcp -s 10.3.162.12 -j ACCEPT --A OUTPUT -m tcp -p tcp -d 10.3.162.12 -j ACCEPT --A INPUT -m udp -p udp -s 10.3.162.12 -j ACCEPT --A OUTPUT -m udp -p udp -d 10.3.162.12 -j ACCEPT --A INPUT -m tcp -p tcp -s 10.3.162.13 -j ACCEPT --A OUTPUT -m tcp -p tcp -d 10.3.162.13 -j ACCEPT --A INPUT -m udp -p udp -s 10.3.162.13 -j ACCEPT --A OUTPUT -m udp -p udp -d 10.3.162.13 -j ACCEPT --A INPUT -m tcp -p tcp -s 10.3.162.14 -j ACCEPT --A OUTPUT -m tcp -p tcp -d 10.3.162.14 -j ACCEPT --A INPUT -m udp -p udp -s 10.3.162.14 -j ACCEPT --A OUTPUT -m udp -p udp -d 10.3.162.14 -j ACCEPT +-A INPUT -m tcp -p tcp -s 10.16.162.11 -j ACCEPT +-A OUTPUT -m tcp -p tcp -d 10.16.162.11 -j ACCEPT +-A INPUT -m udp -p udp -s 10.16.162.11 -j ACCEPT +-A OUTPUT -m udp -p udp -d 10.16.162.11 -j ACCEPT +-A INPUT -m tcp -p tcp -s 10.16.162.12 -j ACCEPT +-A OUTPUT -m tcp -p tcp -d 10.16.162.12 -j ACCEPT +-A INPUT -m udp -p udp -s 10.16.162.12 -j ACCEPT +-A OUTPUT -m udp -p udp -d 10.16.162.12 -j ACCEPT +-A INPUT -m tcp -p tcp -s 10.16.162.13 -j ACCEPT +-A OUTPUT -m tcp -p tcp -d 10.16.162.13 -j ACCEPT +-A INPUT -m udp -p udp -s 10.16.162.13 -j ACCEPT +-A OUTPUT -m udp -p udp -d 10.16.162.13 -j ACCEPT +-A INPUT -m tcp -p tcp -s 10.16.162.14 -j ACCEPT +-A OUTPUT -m tcp -p tcp -d 10.16.162.14 -j ACCEPT +-A INPUT -m udp -p udp -s 10.16.162.14 -j ACCEPT +-A OUTPUT -m udp -p udp -d 10.16.162.14 -j ACCEPT # ntp --A OUTPUT -m udp -p udp --dport 123 -d 10.3.163.31 -j ACCEPT --A OUTPUT -m udp -p udp --dport 123 -d 10.3.163.32 -j ACCEPT +-A OUTPUT -m udp -p udp --dport 123 -d 10.16.163.31 -j ACCEPT +-A OUTPUT -m udp -p udp --dport 123 -d 10.16.163.32 -j ACCEPT # dhcp --A OUTPUT -m udp -p udp --dport 67 -d 10.3.163.10 -j ACCEPT +-A OUTPUT -m udp -p udp --dport 67 -d 10.16.163.10 -j ACCEPT # s390x builders ssh --A INPUT -p tcp -m tcp -s 10.3.0.0/16 --dport 22 -j ACCEPT --A OUTPUT -p tcp -m tcp -d 10.3.0.0/16 --sport 22 -j ACCEPT +-A INPUT -p tcp -m tcp -s 10.16.0.0/16 --dport 22 -j ACCEPT +-A OUTPUT -p tcp -m tcp -d 10.16.0.0/16 --sport 22 -j ACCEPT # if the host/group defines incoming tcp_ports - allow them {% for port in tcp_ports %} diff --git a/roles/base/templates/iptables/iptables.osuosl b/roles/base/templates/iptables/iptables.osuosl index 0211960146..c73949ccd1 100644 --- a/roles/base/templates/iptables/iptables.osuosl +++ b/roles/base/templates/iptables/iptables.osuosl @@ -24,16 +24,16 @@ # allow ssh only from needed ips # vpn in from tun0 -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -s 192.168.0.0/24 -i tun0 -j ACCEPT -# external ip for iad2 --A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -s 38.145.60.0/24 -j ACCEPT +# external ip for rdu3 +-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -s 38.145.32.0/24 -j ACCEPT # for nrpe - allow it from nocs -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.16 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.15 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.163.10 -j ACCEPT # if the host/group defines incoming tcp_ports - allow them {% if tcp_ports is defined %} diff --git a/roles/base/templates/iptables/iptables.releng b/roles/base/templates/iptables/iptables.releng index 4e7638d4c1..b1ce5f16e1 100644 --- a/roles/base/templates/iptables/iptables.releng +++ b/roles/base/templates/iptables/iptables.releng @@ -22,13 +22,13 @@ -A INPUT -p tcp -m tcp -s 192.168.1.10 --dport 5666 -j ACCEPT -A INPUT -p tcp -m tcp -s 192.168.1.166 --dport 5666 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp -s 38.145.60.16 --dport 5666 -j ACCEPT --A INPUT -p tcp -m tcp -s 38.145.60.15 --dport 5666 -j ACCEPT --A INPUT -p tcp -m tcp -s 10.3.163.10 --dport 5666 -j ACCEPT --A INPUT -p tcp -m tcp -s 10.3.166.10 --dport 5666 -j ACCEPT +-A INPUT -p tcp -m tcp -s 38.145.32.16 --dport 5666 -j ACCEPT +-A INPUT -p tcp -m tcp -s 38.145.32.15 --dport 5666 -j ACCEPT +-A INPUT -p tcp -m tcp -s 10.16.163.10 --dport 5666 -j ACCEPT +-A INPUT -p tcp -m tcp -s 10.16.166.10 --dport 5666 -j ACCEPT # Zabbix -A INPUT -p tcp -m tcp --dport 10051 -j ACCEPT --A INPUT -p tcp -m tcp --dport 10050 -s 10.3.163.198 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 10050 -s 10.16.163.198 -j ACCEPT # if the blocked_ips is defined - drop them {% if blocked_ips is defined %} @@ -46,7 +46,7 @@ -A INPUT -p tcp -m tcp --dport 22 -j ACCEPT # Allow all netapp traffic --A INPUT -p udp -m udp -s 10.3.162.0/24 -j ACCEPT +-A INPUT -p udp -m udp -s 10.16.162.0/24 -j ACCEPT # Custom Services diff --git a/roles/base/templates/iptables/iptables.staging b/roles/base/templates/iptables/iptables.staging index 37e41d97fb..b421d79261 100644 --- a/roles/base/templates/iptables/iptables.staging +++ b/roles/base/templates/iptables/iptables.staging @@ -21,12 +21,12 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.16 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.15 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.163.10 -j ACCEPT # zabbix01.stg -A INPUT -p tcp -m tcp --dport 10051 -j ACCEPT --A INPUT -p tcp -m tcp --dport 10050 -s 10.3.166.61 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 10050 -s 10.16.166.61 -j ACCEPT # if the host/group defines incoming tcp_ports - allow them diff --git a/roles/base/templates/iptables/iptables.storinator01.fedorainfracloud.org b/roles/base/templates/iptables/iptables.storinator01.fedorainfracloud.org index b22b8311f0..0acc552575 100644 --- a/roles/base/templates/iptables/iptables.storinator01.fedorainfracloud.org +++ b/roles/base/templates/iptables/iptables.storinator01.fedorainfracloud.org @@ -28,8 +28,8 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.16 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.15 -j ACCEPT # if the host/group defines incoming tcp_ports - allow them {% if tcp_ports_eth0 is defined %} diff --git a/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org b/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org index d09f24aade..fc57ed0acb 100644 --- a/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org +++ b/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org @@ -28,9 +28,9 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.166 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.16 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 38.145.32.15 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 5666 -s 10.16.163.10 -j ACCEPT {% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # diff --git a/roles/base/templates/nftables/nftables b/roles/base/templates/nftables/nftables index 25cea5a238..6558908491 100644 --- a/roles/base/templates/nftables/nftables +++ b/roles/base/templates/nftables/nftables @@ -17,18 +17,6 @@ add rule ip filter OUTPUT ct state related,established counter accept # allow ssh - always add rule ip filter INPUT ct state new tcp dport 22 counter accept -# iad2 -# for nrpe - allow it from nocs -add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept -# FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.166.10 tcp dport 5666 counter accept -# zabbix01 -add rule ip filter INPUT tcp dport 10051 counter accept -add rule ip filter INPUT ip saddr 10.3.163.198 tcp dport 10050 counter accept # rdu3 # for nrpe - allow it from nocs #add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept @@ -40,25 +28,25 @@ add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 10.16.166.10 tcp dport 5666 counter accept # zabbix01 add rule ip filter INPUT tcp dport 10051 counter accept -add rule ip filter INPUT ip saddr 10.3.163.198 tcp dport 10050 counter accept +add rule ip filter INPUT ip saddr 10.16.163.198 tcp dport 10050 counter accept -{% if env != 'staging' and datacenter == 'iad2' and inventory_hostname not in groups['staging_friendly'] %} +{% if env != 'staging' and datacenter == 'rdu3' and inventory_hostname not in groups['staging_friendly'] %} # -# In the iad2 datacenter, both production and staging hosts are in different +# In the rdu3 datacenter, both production and staging hosts are in different # vlans, and different subnets. However, just as a precaution, we want prod machines to # reject connections from any staging host just in case there's some globally enabled port. # There are however a few hosts in production we have marked 'staging-friendly' # that we do allow staging to talk to for mostly read-only data they need. # -add rule ip filter INPUT ip saddr 10.3.166.0/24 counter reject with icmp type host-prohibited -add rule ip filter INPUT ip saddr 10.3.167.0/24 counter reject with icmp type host-prohibited +add rule ip filter INPUT ip saddr 10.16.166.0/24 counter reject with icmp type host-prohibited +add rule ip filter INPUT ip saddr 10.16.167.0/24 counter reject with icmp type host-prohibited {% endif %} {% if vpn %} # # We want to have all vpn hosts reject most things from the 'less secure' vpn network # -{% if inventory_hostname == 'log01.iad2.fedoraproject.org' %} +{% if inventory_hostname == 'log01.rdu3.fedoraproject.org' %} # Allow all vpn hosts to talk to the log server for rsyslog add rule ip filter INPUT ip saddr 192.168.100.0/24 tcp dport 514 counter accept add rule ip filter INPUT ip saddr 192.168.100.0/24 udp dport 25826 counter accept @@ -111,7 +99,7 @@ add rule ip filter INPUT ip saddr {{ hostvars[proxy]['ansible_tun0']['ipv4']['ad {% endif %} {% endfor %} # nagios -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport {{ port }} counter accept +add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport {{ port }} counter accept {% endfor %} {% endif %} diff --git a/roles/base/templates/nftables/nftables.bastion b/roles/base/templates/nftables/nftables.bastion index 0d8b4c2fee..770674ec9c 100644 --- a/roles/base/templates/nftables/nftables.bastion +++ b/roles/base/templates/nftables/nftables.bastion @@ -21,10 +21,10 @@ add rule ip filter INPUT ct state new tcp dport 22 counter accept add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept # FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.166.10 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 10.16.166.10 tcp dport 5666 counter accept # add rdu3 ips add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept @@ -32,25 +32,25 @@ add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 10.16.166.10 tcp dport 5666 counter accept # zabbix01 add rule ip filter INPUT tcp dport 10051 counter accept -add rule ip filter INPUT ip saddr 10.3.163.198 tcp dport 10050 counter accept +add rule ip filter INPUT ip saddr 10.16.163.198 tcp dport 10050 counter accept -{% if env != 'staging' and datacenter == 'iad2' and inventory_hostname not in groups['staging_friendly'] %} +{% if env != 'staging' and datacenter == 'rdu3' and inventory_hostname not in groups['staging_friendly'] %} # -# In the iad2 datacenter, both production and staging hosts are in different +# In the rdu3 datacenter, both production and staging hosts are in different # vlans, and different subnets. However, just as a precaution, we want prod machines to # reject connections from any staging host just in case there's some globally enabled port. # There are however a few hosts in production we have marked 'staging-friendly' # that we do allow staging to talk to for mostly read-only data they need. # -add rule ip filter INPUT ip saddr 10.3.166.0/24 counter reject with icmp type host-prohibited -add rule ip filter INPUT ip saddr 10.3.167.0/24 counter reject with icmp type host-prohibited +add rule ip filter INPUT ip saddr 10.16.166.0/24 counter reject with icmp type host-prohibited +add rule ip filter INPUT ip saddr 10.16.167.0/24 counter reject with icmp type host-prohibited {% endif %} {% if vpn %} # # We want to have all vpn hosts reject most things from the 'less secure' vpn network # -{% if inventory_hostname == 'log01.iad2.fedoraproject.org' %} +{% if inventory_hostname == 'log01.rdu3.fedoraproject.org' %} # Allow all vpn hosts to talk to the log server for rsyslog add rule ip filter INPUT ip saddr 192.168.100.0/24 tcp dport 514 counter accept add rule ip filter INPUT ip saddr 192.168.100.0/24 udp dport 25826 counter accept @@ -81,7 +81,7 @@ add rule ip filter INPUT ip saddr 192.168.0.0/24 tcp dport 25 counter accept # now I don't see where we'd get the right ip/netmask from in vars add rule ip filter INPUT ip saddr 10.16.160.0/19 tcp dport 25 counter accept {% else %} -add rule ip filter INPUT ip saddr 10.3.160.0/19 tcp dport 25 counter accept +add rule ip filter INPUT ip saddr 10.16.160.0/19 tcp dport 25 counter accept {% endif %} # s390x builders/virthost @@ -137,7 +137,7 @@ add rule ip filter INPUT ip saddr {{ hostvars[proxy]['ansible_tun0']['ipv4']['ad {% endif %} {% endfor %} # nagios -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport {{ port }} counter accept +add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport {{ port }} counter accept {% endfor %} {% endif %} diff --git a/roles/base/templates/nftables/nftables.kojibuilder b/roles/base/templates/nftables/nftables.kojibuilder index 00fd8d3b43..9c0ea09d06 100644 --- a/roles/base/templates/nftables/nftables.kojibuilder +++ b/roles/base/templates/nftables/nftables.kojibuilder @@ -70,11 +70,6 @@ add rule ip filter OUTPUT ip daddr 10.16.163.31 tcp dport 25 counter accept # infra.fp.o add rule ip filter OUTPUT ip daddr 10.16.163.35 tcp dport 80 counter accept add rule ip filter OUTPUT ip daddr 10.16.163.35 tcp dport 443 counter accept -# temp allow external iad2 infra until after the move -add rule ip filter OUTPUT ip daddr 38.145.60.16 tcp dport 80 counter accept -add rule ip filter OUTPUT ip daddr 38.145.60.16 tcp dport 443 counter accept -add rule ip filter OUTPUT ip daddr 38.145.60.20 tcp dport 443 counter accept -add rule ip filter OUTPUT ip daddr 38.145.60.21 tcp dport 443 counter accept # rsyslog out to log01 add rule ip filter OUTPUT ip daddr 10.16.163.39 tcp dport 514 counter accept @@ -99,11 +94,8 @@ add rule ip filter OUTPUT ip daddr 10.16.169.104 tcp dport 22 counter accept # https git on pagure,io add rule ip filter OUTPUT ip daddr 8.43.85.76 tcp dport 443 counter accept -# Now we need to allow iad2 to speak to iad2 and rdu3 to speak to rdu3 -# but not cross the streams. - # IP Helper: -# 10.16. = .ida2. +# 10.3. = .iad2. # 10.16. = .rdu3. # 10.16.166.74 = proxy01.stg # 10.16.166.75 = proxy02.stg @@ -120,13 +112,11 @@ add rule ip filter OUTPUT ip daddr 8.43.85.76 tcp dport 443 counter accept # 10.16.163.31 = bastion01 # 10.16.163.10 = noc01 -# NFS (in storage.neta-002.prod.iad2.dc.redhat.com) -# 10.16.162.11 = ntap-iad2-c02-fedora01-nfs01a -# 10.16.162.12 = ntap-iad2-c02-fedora01-nfs01b -# 10.16.162.13 = ntap-iad2-c02-fedora01-nfs02a -# 10.16.162.14 = ntap-iad2-c02-fedora01-nfs02b -# Dito... -# 10.16.162.11 =ntap-rdu3-c02-fedora01-nfs01a .neta-002.prod.rdu2.dc.redhat.com +# NFS (in storage neta-002.prod.rdu2.dc.redhat.com) +# 10.16.162.11 = ntap-rdu3-c02-fedora01-nfs01a +# 10.16.162.12 = ntap-rdu3-c02-fedora01-nfs01b +# 10.16.162.13 = ntap-rdu3-c02-fedora01-nfs02a +# 10.16.162.14 = ntap-rdu3-c02-fedora01-nfs02b # admin.fedoraproject.org for fas (proyx(1)01 and proxy(1)10) {% if host in groups['staging'] %} diff --git a/roles/base/templates/nftables/nftables.osuosl b/roles/base/templates/nftables/nftables.osuosl index ce2b846f51..ac87505328 100644 --- a/roles/base/templates/nftables/nftables.osuosl +++ b/roles/base/templates/nftables/nftables.osuosl @@ -24,8 +24,6 @@ add rule ip filter INPUT ip saddr {{ ip }} counter drop # allow ssh only from needed ips # vpn in from tun0 add rule ip filter INPUT iifname "tun0" ip saddr 192.168.0.0/24 ct state new tcp dport 22 counter accept -# external ip for iad2 -add rule ip filter INPUT ip saddr 38.145.60.0/24 ct state new tcp dport 22 counter accept # external ip for rdu3 add rule ip filter INPUT ip saddr 38.145.32.0/24 ct state new tcp dport 22 counter accept @@ -34,8 +32,8 @@ add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.66 tcp dport 5666 counter accept # FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept diff --git a/roles/base/templates/nftables/nftables.releng b/roles/base/templates/nftables/nftables.releng index 0492e1b902..725931529a 100644 --- a/roles/base/templates/nftables/nftables.releng +++ b/roles/base/templates/nftables/nftables.releng @@ -22,10 +22,10 @@ add rule ip filter INPUT ct state related,established counter accept add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept # FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.166.10 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 10.16.166.10 tcp dport 5666 counter accept # add rdu3 ips add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept @@ -33,7 +33,7 @@ add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 10.16.166.10 tcp dport 5666 counter accept # Zabbix add rule ip filter INPUT tcp dport 10051 counter accept -add rule ip filter INPUT ip saddr 10.3.163.198 tcp dport 10050 counter accept +add rule ip filter INPUT ip saddr 10.16.163.198 tcp dport 10050 counter accept # if the blocked_ips is defined - drop them {% if blocked_ips is defined %} @@ -52,7 +52,7 @@ add rule ip filter INPUT ip saddr 192.168.100.0/24 tcp dport 22 counter reject w add rule ip filter INPUT tcp dport 22 counter accept # Allow all netapp traffic -add rule ip filter INPUT ip saddr 10.3.162.0/24 counter accept +add rule ip filter INPUT ip saddr 10.16.162.0/24 counter accept # Custom Services diff --git a/roles/base/templates/nftables/nftables.staging b/roles/base/templates/nftables/nftables.staging index ba39547376..0a937a3545 100644 --- a/roles/base/templates/nftables/nftables.staging +++ b/roles/base/templates/nftables/nftables.staging @@ -22,15 +22,15 @@ add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.66 tcp dport 5666 counter accept # FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept # zabbix01.stg add rule ip filter INPUT tcp dport 10051 counter accept -add rule ip filter INPUT ip saddr 10.3.166.61 tcp dport 10050 counter accept +add rule ip filter INPUT ip saddr 10.16.166.61 tcp dport 10050 counter accept # if the host/group defines incoming tcp_ports - allow them diff --git a/roles/base/templates/nftables/nftables.storinator01.fedorainfracloud.org b/roles/base/templates/nftables/nftables.storinator01.fedorainfracloud.org index 4e1885a941..fbb967c7f2 100644 --- a/roles/base/templates/nftables/nftables.storinator01.fedorainfracloud.org +++ b/roles/base/templates/nftables/nftables.storinator01.fedorainfracloud.org @@ -28,9 +28,9 @@ add rule ip filter INPUT ct state new tcp dport 22 counter accept add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept # FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept -# NOTE: we don't allow 10.3.163.10 / 10.3.166.10 or zabbix? +add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept +# NOTE: we don't allow 10.16.163.10 / 10.16.166.10 or zabbix? # if the host/group defines incoming tcp_ports - allow them # NOTE: These are specific to eth0 diff --git a/roles/base/templates/nftables/nftables.torrent02.fedoraproject.org b/roles/base/templates/nftables/nftables.torrent02.fedoraproject.org index 21f105432f..d384153524 100644 --- a/roles/base/templates/nftables/nftables.torrent02.fedoraproject.org +++ b/roles/base/templates/nftables/nftables.torrent02.fedoraproject.org @@ -28,10 +28,10 @@ add rule ip filter INPUT ct state new tcp dport 22 counter accept add rule ip filter INPUT ip saddr 192.168.1.10 tcp dport 5666 counter accept add rule ip filter INPUT ip saddr 192.168.1.166 tcp dport 5666 counter accept # FIXME - this is the global nat-ip and we need the noc01-specific ip -add rule ip filter INPUT ip saddr 38.145.60.16 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 38.145.60.15 tcp dport 5666 counter accept -add rule ip filter INPUT ip saddr 10.3.163.10 tcp dport 5666 counter accept -# NOTE: This doesn't include 10.3.166.10 +add rule ip filter INPUT ip saddr 38.145.32.16 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 38.145.32.15 tcp dport 5666 counter accept +add rule ip filter INPUT ip saddr 10.16.163.10 tcp dport 5666 counter accept +# NOTE: This doesn't include 10.16.166.10 # NOTE: This doesn't include zabbix. {% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} diff --git a/roles/batcave/files/allows b/roles/batcave/files/allows index 7c77dc84a9..f9ccc9de66 100644 --- a/roles/batcave/files/allows +++ b/roles/batcave/files/allows @@ -36,7 +36,7 @@ require ip 213.175.193.205 require ip 213.175.193.206 require ip 213.175.193.207 require ip 38.145.48.0/23 -require ip 38.145.60.0/23 +require ip 38.145.32.0/23 require ip 38.145.32.0/23 @@ -173,7 +173,7 @@ require ip 13.244.109.203 require ip 15.228.51.95 require ip 13.244.113.71 require ip 13.245.77.95 -require ip 38.145.60.11 +require ip 38.145.32.11 require ip 34.217.21.196 require ip 35.86.151.207 require ip 18.192.40.85 diff --git a/roles/batcave/files/centos-10-sync b/roles/batcave/files/centos-10-sync index 2a31480262..0ec1e0031b 100644 --- a/roles/batcave/files/centos-10-sync +++ b/roles/batcave/files/centos-10-sync @@ -6,7 +6,7 @@ RS_OPT="-avSHP --numeric-ids" RS_DEADLY="--delete --delete-excluded --delete-delay --delay-updates" CENT_EXCLUDES="--exclude=iso --exclude=kickstart --exclude=images --exclude=debug --exclude=source" -SERVER=centos-master01.iad2.fedoraproject.org +SERVER=centos-master01.rdu3.fedoraproject.org ## Mirror CentOS-10-Stream diff --git a/roles/batcave/files/centos-9s-sync b/roles/batcave/files/centos-9s-sync index abccabe77e..33f8416a7f 100644 --- a/roles/batcave/files/centos-9s-sync +++ b/roles/batcave/files/centos-9s-sync @@ -6,7 +6,7 @@ RS_OPT="-avSHP --numeric-ids" RS_DEADLY="--delete --delete-excluded --delete-delay --delay-updates" CENT_EXCLUDES="--exclude=iso --exclude=kickstart --exclude=images --exclude=debug --exclude=source" -SERVER=centos-master01.iad2.fedoraproject.org +SERVER=centos-master01.rdu3.fedoraproject.org ## Mirror CentOS-9-Stream diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index bad0512642..237ffef625 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -1,2 +1,2 @@ -@cert-authority *.rdu3.fedoraproject.org,*.fedoraproject.org,*.iad2.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org -@cert-authority *.stg.rdu3.fedoraproject.org,*.stg.s390.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.iad2.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org +@cert-authority *.rdu3.fedoraproject.org,*.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org +@cert-authority *.stg.rdu3.fedoraproject.org,*.stg.s390.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org diff --git a/roles/chrony/templates/chrony.conf.j2 b/roles/chrony/templates/chrony.conf.j2 index 73b3bac1b4..04f1cefaad 100644 --- a/roles/chrony/templates/chrony.conf.j2 +++ b/roles/chrony/templates/chrony.conf.j2 @@ -1,12 +1,9 @@ # setup our servers -{% if ( datacenter == 'iad2' or datacenter == 'staging' ) and not ansible_hostname.startswith('bastion') %} -server bastion01.iad2.fedoraproject.org iburst -server bastion02.iad2.fedoraproject.org iburst -{% elif datacenter == 'cloud' and not ansible_hostname.startswith('cloud-noc') %} -server cloud-noc01.fedorainfracloud.org port 124 -{% elif datacenter == 'rdu3' and not ansible_hostname.startswith('bastion') %} +{% if ( datacenter == 'rdu3' or datacenter == 'staging' ) and not ansible_hostname.startswith('bastion') %} server bastion01.rdu3.fedoraproject.org iburst server bastion02.rdu3.fedoraproject.org iburst +{% elif datacenter == 'cloud' and not ansible_hostname.startswith('cloud-noc') %} +server cloud-noc01.fedorainfracloud.org port 124 {% elif datacenter == 'cloud' and ansible_hostname.startswith('cloud-noc') %} server 0.rhel.pool.ntp.org iburst server 1.rhel.pool.ntp.org iburst diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org deleted file mode 100644 index 60b7dd4cd2..0000000000 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org +++ /dev/null @@ -1,2029 +0,0 @@ -# -# DHCP Server Configuration file. -# see /usr/share/doc/dhcp*/dhcpd.conf.example -# see dhcpd.conf(5) man page -# -server-identifier noc01.iad2.fedoraproject.org; -ddns-update-style none; -authoritative; - -option space pxelinux; -option pxelinux.magic code 208 = string; -option pxelinux.configfile code 209 = text; -option pxelinux.pathprefix code 210 = text; -option pxelinux.reboottime code 211 = unsigned integer 32; -option architecture-type code 93 = unsigned integer 16; - -subnet 10.3.160.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - - option domain-name "mgmt.iad2.fedoraproject.org"; - option routers 10.3.160.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.160.200 10.3.160.249; - -} - -subnet 10.3.161.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - - option domain-name "mgmt.iad2.fedoraproject.org"; - option routers 10.3.161.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.161.200 10.3.161.249; - -} - -subnet 10.3.163.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.163.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.163.200 10.3.163.239; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - -} - -subnet 10.3.164.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.164.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.164.220 10.3.164.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.165.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.165.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.165.220 10.3.165.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.166.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.166.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.166.220 10.3.166.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.167.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.167.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.167.220 10.3.167.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.168.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.168.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.168.220 10.3.168.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.169.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.169.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.169.200 10.3.169.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - option routers 10.3.169.254; - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.170.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.170.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.170.200 10.3.170.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } -} - -subnet 10.3.171.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.171.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.171.200 10.3.171.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - -} - -subnet 10.3.172.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.172.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.172.220 10.3.172.249; - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - - -} - -subnet 10.3.173.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.173.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.173.220 10.3.173.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - -} - -subnet 10.3.174.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.174.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.174.220 10.3.174.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - -} - -subnet 10.3.175.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.175.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.175.220 10.3.175.249; - - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - -} - -subnet 10.3.176.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - option domain-name "iad2.fedoraproject.org"; - option routers 10.3.176.254; - option domain-name-servers 10.3.163.33, 10.3.163.34; - option log-servers 10.3.163.39; - option ntp-servers 10.3.163.31, 10.3.163.32; - - range 10.3.176.220 10.3.176.249; - class "pxeclients" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; - next-server 10.3.163.10; - - if option architecture-type = 00:07 or option architecture-type = 00:09 { - filename "uefi/grubx64.efi"; - } else if option architecture-type = 00:0b { - filename "uefi/grubaa64.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } - } - -} - -subnet 10.16.160.0 netmask 255.255.255.0 { - allow booting; - allow bootp; - - option domain-name "mgmt.rdu3.fedoraproject.org"; - option routers 10.16.160.254; - option domain-name-servers 10.16.163.33, 10.16.163.34; - option log-servers 10.16.163.39; - option ntp-servers 10.16.163.31, 10.16.163.32; - - range 10.16.160.200 10.16.160.249; - -} - -# Prod Network -host vmhost-x86-01 { - hardware ethernet E4:43:4B:B1:70:88; - fixed-address 10.3.163.11; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-02 { - hardware ethernet E4:43:4B:BA:E8:44; - fixed-address 10.3.163.12; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-03 { - hardware ethernet E4:43:4B:B1:28:CC; - fixed-address 10.3.163.13; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-04 { - hardware ethernet E4:43:4B:B1:62:A8; - fixed-address 10.3.163.14; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-05 { - hardware ethernet E4:43:4B:AE:4B:B8; - fixed-address 10.3.163.15; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-06 { - hardware ethernet E4:43:4B:B1:28:EE; - fixed-address 10.3.163.16; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-07 { - hardware ethernet E4:43:4B:22:CE:CA; - fixed-address 10.3.163.17; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-08 { - hardware ethernet 6c:fe:54:88:ec:34; - fixed-address 10.3.163.28; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} - -host openqa-x86-worker03 { - hardware ethernet 24:6E:96:B0:E0:78; - fixed-address 10.3.174.23; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -host oshift4-x86-fe-02 { - hardware ethernet EC:F4:BB:E1:C2:D8; - fixed-address 10.3.163.21; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host oshift4-x86-fe-03 { - hardware ethernet EC:F4:BB:E1:D3:78; - fixed-address 10.3.163.22; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} - - -host centos01 { - hardware ethernet e4:43:4b:b4:fa:18; - fixed-address 10.3.163.19; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} - -# Production network -host worker01-ocp { - hardware ethernet 68:05:CA:CE:A3:C9; - fixed-address 10.3.163.123; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host worker02-ocp { - hardware ethernet 68:05:CA:CE:A2:91; - fixed-address 10.3.163.124; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host worker03-ocp { - hardware ethernet 68:05:CA:CE:A7:4D; - fixed-address 10.3.163.125; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host worker04-ocp { - hardware ethernet 6c:fe:54:71:22:bc; - fixed-address 10.3.163.127; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host worker05-ocp { - hardware ethernet 6C:FE:54:71:23:08; - fixed-address 10.3.163.128; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -host worker06-ocp { - hardware ethernet 24:6E:96:B1:5E:B0; - fixed-address 10.3.163.129; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} -# Staging network -host worker01-ocp-stg { - hardware ethernet 68:05:CA:CE:A2:AC; - fixed-address 10.3.166.118; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host worker02-ocp-stg { - hardware ethernet 68:05:CA:CE:A3:24; - fixed-address 10.3.166.119; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host worker03-ocp-stg { - hardware ethernet 68:05:CA:CE:A5:10; - fixed-address 10.3.166.120; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host worker04-ocp-stg { - hardware ethernet ec:f4:bb:e1:d3:78; - fixed-address 10.3.166.122; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host worker05-ocp-stg { - hardware ethernet ec:f4:bb:e1:c2:d8; - fixed-address 10.3.166.123; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-01-stg { - hardware ethernet 6c:fe:54:88:f0:d4; - fixed-address 10.3.166.11; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-02-stg { - hardware ethernet 24:6e:96:13:ed:d8; - fixed-address 10.3.166.12; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-05-stg { - hardware ethernet A0:36:9F:DE:88:28; - fixed-address 10.3.166.15; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-06-stg { - hardware ethernet A0:36:9F:DE:85:BC; - fixed-address 10.3.166.16; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-07-stg { - hardware ethernet A0:36:9F:F1:83:E0; - fixed-address 10.3.166.17; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-08-stg { - hardware ethernet 24:6E:96:C1:6E:B8; - fixed-address 10.3.166.18; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-09-stg { - hardware ethernet 6c:fe:54:57:80:2d; - fixed-address 10.3.166.19; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} -host vmhost-x86-10-stg { - hardware ethernet EC:F4:BB:E1:CB:88; - fixed-address 10.3.166.20; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} - -host vmhost-x86-11-stg-mgmt { - hardware ethernet 2c:ea:7f:f3:6c:be; - fixed-address 10.3.160.46; - option host-name "vmhost-x86-11-stg"; -} -host vmhost-x86-11-stg { - hardware ethernet E4:43:4B:F7:B7:B8; - fixed-address 10.3.166.28; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} - -host vmhost-x86-12-stg-mgmt { - hardware ethernet 2c:ea:7f:f3:82:fc; - fixed-address 10.3.160.47; - option host-name "vmhost-x86-12-stg"; -} -host vmhost-x86-12-stg { - hardware ethernet E4:43:4B:F7:AD:10; - fixed-address 10.3.166.29; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.166.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-x86-01-stg { - hardware ethernet 24:6E:96:B1:56:20; - fixed-address 10.3.167.11; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-02-stg { - hardware ethernet 6C:FE:54:57:5F:48; - fixed-address 10.3.167.12; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-03-stg { - hardware ethernet 24:6E:96:B1:C7:F0; - fixed-address 10.3.167.13; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-x86-04-stg-mgmt { - hardware ethernet B8:2A:72:FC:EE:68; - fixed-address 10.3.160.199; - option host-name "bvmhost-x86-04-stg-mgmt"; -} -host bvmhost-x86-04-stg { - hardware ethernet EC:F4:BB:D2:8F:00; - fixed-address 10.3.167.14; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-x86-05-stg-mgmt { - hardware ethernet 2c:ea:7f:f3:58:4e; - fixed-address 10.3.160.157; - option host-name "bvmhost-x86-05-stg"; -} -host bvmhost-x86-05-stg { - hardware ethernet E4:43:4B:F7:AC:CC; - fixed-address 10.3.167.17; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-a64-01-stg { - hardware ethernet 0c:42:a1:c2:5d:a6; - fixed-address 10.3.167.16; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} - -# Build network -host bvmhost-x86-01 { - hardware ethernet E4:43:4B:B1:05:54; - fixed-address 10.3.169.11; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-02 { - hardware ethernet E4:43:4B:B1:69:FE; - fixed-address 10.3.169.12; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-03 { - hardware ethernet E4:43:4B:B1:62:64; - fixed-address 10.3.169.13; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-04 { - hardware ethernet E4:43:4B:B1:03:30; - fixed-address 10.3.169.14; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-05 { - hardware ethernet E4:43:4B:AE:44:EE; - fixed-address 10.3.169.15; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-06 { - hardware ethernet E4:43:4B:AC:E1:54 ; - fixed-address 10.3.169.16; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host autosign01 { - hardware ethernet EC:F4:BB:D2:85:48 ; - fixed-address 10.3.169.28; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host autosign02 { - hardware ethernet 6C:FE:54:57:4D:80; - fixed-address 10.3.169.47; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host autosign02-mgmt { - fixed-address 10.3.160.130; - hardware ethernet c8:4b:d6:8a:4a:a0; -} -host bvmhost-x8-07 { - hardware ethernet E4:43:4B:B1:2B:52; - fixed-address 10.3.169.17; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-x86-08 { - hardware ethernet E4:43:4B:24:19:76 ; - fixed-address 10.3.169.18; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} - -host buildhw-x86-01 { - hardware ethernet 14:9E:CF:61:9E:61; - fixed-address 10.3.169.31; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-02 { - hardware ethernet 14:9E:CF:61:9F:4F; - fixed-address 10.3.169.32; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-03 { - hardware ethernet 14:9E:CF:61:9E:C9; - fixed-address 10.3.169.33; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-04 { - hardware ethernet 14:9e:cf:61:a5:07; - fixed-address 10.3.169.34; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-05 { - hardware ethernet 14:9e:cf:61:9e:7b; - fixed-address 10.3.169.35; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-06 { - hardware ethernet 14:9e:cf:61:a0:bd; - fixed-address 10.3.169.36; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-07 { - hardware ethernet 14:9e:cf:61:9e:e3; - fixed-address 10.3.169.37; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-08 { - hardware ethernet 14:9e:cf:61:a6:75; - fixed-address 10.3.169.38; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-09 { - hardware ethernet f8:ca:b8:f7:26:e1; - fixed-address 10.3.169.39; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-10 { - hardware ethernet f8:ca:b8:f7:27:cf; - fixed-address 10.3.169.40; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-11 { - hardware ethernet f8:ca:b8:f7:27:63; - fixed-address 10.3.169.41; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-12 { - hardware ethernet f8:ca:b8:f7:2e:f5; - fixed-address 10.3.169.42; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-13 { - hardware ethernet f8:ca:b8:f7:27:49; - fixed-address 10.3.169.43; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-14 { - hardware ethernet f8:ca:b8:f7:2d:87; - fixed-address 10.3.169.44; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-15 { - hardware ethernet f8:ca:b8:f7:26:fb; - fixed-address 10.3.169.45; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host buildhw-x86-16 { - hardware ethernet f8:ca:b8:f7:29:3d; - fixed-address 10.3.169.46; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} - -host bkernel01 { - hardware ethernet B4:45:06:FB:84:2E ; - fixed-address 10.3.169.29; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} -host sign-vault01 { - hardware ethernet D0:94:66:45:A1:62; - option host-name "sign-vault01"; - fixed-address 10.3.169.26; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.169.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-a64-01 { - hardware ethernet 0c:42:a1:52:1a:dc; - fixed-address 10.3.170.11; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-a64-02 { - hardware ethernet 04:3f:72:d7:7a:a6; - fixed-address 10.3.170.12; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-a64-03 { - hardware ethernet b8:ce:f6:04:74:d8; - fixed-address 10.3.170.13; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} -host bvmhost-a64-04 { - hardware ethernet 04:3f:72:d7:7f:f7; - fixed-address 10.3.170.14; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} -host qvmhost-x86-01 { - hardware ethernet E4:43:4B:A8:C1:FE; - fixed-address 10.3.174.11; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host qvmhost-x86-02 { - hardware ethernet E4:43:4B:A8:B3:0E; - fixed-address 10.3.174.12; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -host openqa01-x64-worker01 { - hardware ethernet E4:43:4B:A7:98:66 ; - fixed-address 10.3.174.21; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-x86-worker02 { - hardware ethernet E4:43:4B:23:E8:CC ; - fixed-address 10.3.174.22; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-x64-worker04 { - hardware ethernet E4:43:4B:24:10:AA ; - fixed-address 10.3.174.24; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-a64-worker02 { - hardware ethernet 50:6b:4b:7f:a8:b0 ; - fixed-address 10.3.174.62; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-a64-worker03 { - hardware ethernet 50:6b:4b:7f:98:30 ; - fixed-address 10.3.174.63; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -host openqa-a64-worker01-mgmt { - hardware ethernet e8:6a:64:39:18:ef; - fixed-address 10.3.160.114; - option host-name "openqa-a64-worker01-mgmt"; -} -host openqa-a64-worker01 { - hardware ethernet 50:6b:4b:6a:b6:20 ; - fixed-address 10.3.174.61; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-a64-worker05-mgmt { - hardware ethernet E8:6A:64:39:18:73; - fixed-address 10.3.160.116; - option host-name "openqa-a64-worker05-mgmt"; -} -host openqa-a64-worker05 { - hardware ethernet 50:6b:4b:6a:eb:b0 ; - fixed-address 10.3.174.65; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-a64-worker06-mgmt { - hardware ethernet E8:6A:64:39:19:67; - fixed-address 10.3.160.118; - option host-name "openqa-a64-worker06-mgmt"; -} -host openqa-a64-worker06 { - hardware ethernet 50:6B:4B:6A:C4:90 ; - fixed-address 10.3.174.66; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - - - -host bkernel02 { - hardware ethernet d0:94:66:45:8c:0f; - option routers 10.3.169.254; - fixed-address 10.3.169.30; - option host-name "bkernel02"; -} - -host bvmhost-p09-01 { - hardware ethernet 40:a6:b7:18:8a:38; - fixed-address 10.3.171.15; - next-server 10.3.163.10; - option routers 10.3.171.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-p09-02 { - hardware ethernet 40:a6:b7:18:86:b4; - fixed-address 10.3.171.16; - next-server 10.3.163.10; - option routers 10.3.171.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-p09-04 { - hardware ethernet 40:a6:b7:18:86:c8; - fixed-address 10.3.171.18; - next-server 10.3.163.10; - option routers 10.3.171.254; - option subnet-mask 255.255.255.0; -} - -# -# All MGMT hosts go below here -# - # Dell FX - -host openqa-x86-worker02-mgmt { - hardware ethernet 4c:d9:8f:03:95:28; - fixed-address 10.3.160.138; - option host-name "oqa-x86-worker02"; -} - -host centos-mgmt01 { - hardware ethernet 4C:D9:8F:BC:5A:EA; - fixed-address 10.3.160.69; - option host-name "centos01-mgmt"; -} -host centos-mgmt02 { - hardware ethernet 4C:D9:8F:BC:8A:06; - fixed-address 10.3.160.70; - option host-name "centos02-mgmt"; -} - -host dell-fx01-mgmt { - hardware ethernet f4:8e:38:c1:3f:b6; - fixed-address 10.3.160.11; - option host-name "dell-fx01"; -} -host dell-fx01-fc01-mgmt { - hardware ethernet 14:9E:CF:61:9E:60; - fixed-address 10.3.160.12; - option host-name "dell-fx01-fc01"; -} -host dell-fx01-fc02-mgmt { - hardware ethernet 14:9E:CF:61:9F:30; - fixed-address 10.3.160.13; - option host-name "dell-fx01-fc02"; -} -host dell-fx01-fc03-mgmt { - hardware ethernet 14:9E:CF:61:A4:E9; - fixed-address 10.3.160.14; - option host-name "dell-fx01-fc03"; -} -host dell-fx01-fc04-mgmt { - hardware ethernet 14:9E:CF:61:A4:EA; - fixed-address 10.3.160.15; - option host-name "dell-fx01-fc04"; -} -host dell-fx01-fc05-mgmt { - hardware ethernet 14:9E:CF:61:9E:7A; - fixed-address 10.3.160.16; - option host-name "dell-fx01-fc05"; -} -host dell-fx01-fc06-mgmt { - hardware ethernet 14:9E:CF:61:A0:9E; - fixed-address 10.3.160.17; - option host-name "dell-fx01-fc06"; -} -host dell-fx01-fc07-mgmt { - hardware ethernet 14:9E:CF:61:A6:57; - fixed-address 10.3.160.18; - option host-name "dell-fx01-fc07"; -} -host dell-fx01-fc08-mgmt { - hardware ethernet 14:9E:CF:61:A6:58; - fixed-address 10.3.160.19; - option host-name "dell-fx01-08"; -} -host dell-fx02-mgmt { - hardware ethernet f4:8e:38:c1:48:c6; - fixed-address 10.3.160.20; - option host-name "dell-fx02"; -} -host dell-fx02-fc01-mgmt { - hardware ethernet F8:CA:B8:F7:26:E0; - fixed-address 10.3.160.21; - option host-name "dell-fx02-fc01"; -} -host dell-fx02-fc02-mgmt { - hardware ethernet F8:CA:B8:F7:27:B0; - fixed-address 10.3.160.22; - option host-name "dell-fx02-fc02"; -} -host dell-fx02-fc03-mgmt { - hardware ethernet F8:CA:B8:F7:2D:69; - fixed-address 10.3.160.23; - option host-name "dell-fx02-fc03"; -} -host dell-fx02-fc04-mgmt { - hardware ethernet F8:CA:B8:F7:2D:6A; - fixed-address 10.3.160.24; - option host-name "dell-fx02-fc04"; -} -host dell-fx02-fc05-mgmt { - hardware ethernet F8:CA:B8:F7:26:FA; - fixed-address 10.3.160.25; - option host-name "dell-fx02-fc05"; -} -host dell-fx02-fc06-mgmt { - hardware ethernet F8:CA:B8:F7:29:1E; - fixed-address 10.3.160.26; - option host-name "dell-fx02-fc06"; -} -host dell-fx02-fc07-mgmt { - hardware ethernet F8:CA:B8:F7:2E:D7; - fixed-address 10.3.160.27; - option host-name "dell-fx02-fc07"; -} -host dell-fx02-fc08-mgmt { - hardware ethernet F8:CA:B8:F7:2E:D8; - fixed-address 10.3.160.28; - option host-name "dell-fx02-08"; -} -host cavium01-mgmt { - hardware ethernet e0:d5:5e:ae:59:8d; - fixed-address 10.3.160.29; - option host-name "cavium01"; -} -host cavium02-mgmt { - hardware ethernet e0:d5:5e:ae:53:e1; - fixed-address 10.3.160.30; - option host-name "cavium02"; -} -host opengear01 { - hardware ethernet 00:13:C6:01:00:85; - fixed-address 10.3.160.31; - option host-name "opengear01-mgmt"; -} -host dell-r6x0-01-mgmt { - hardware ethernet 64:00:6A:C4:8A:BE; - fixed-address 10.3.160.33; - option host-name "vmhost02-stg-mgmt"; -} -host dell-r6x0-02-mgmt { - hardware ethernet 64:00:6A:C1:DC:82; - fixed-address 10.3.160.34; - option host-name "bvmhost01-stg-mgmt"; -} -host dell-r6x0-03-mgmt { - hardware ethernet 64:00:6A:C1:EF:F0; - fixed-address 10.3.160.35; - option host-name "bvmhost01-mgmt"; -} -host dell-r6x0-04-mgmt { - hardware ethernet 84:7b:eb:f3:62:32; - fixed-address 10.3.160.36; - option host-name "virthost06"; -} -host dell-r6x0-05-mgmt { - hardware ethernet 84:7B:EB:F3:BC:7A; - fixed-address 10.3.160.37; - option host-name "bvirthost04"; -} -host dell-r6x0-06-mgmt { - hardware ethernet 10:7D:1A:FF:5A:B6; - fixed-address 10.3.160.38; - option host-name "bvirthost05"; -} -host dell-r6x0-07-mgmt { - hardware ethernet D0:94:66:44:CE:44; - fixed-address 10.3.160.39; - option host-name "vmhost01"; -} -host dell-r6x0-08-mgmt { - hardware ethernet 58:8A:5A:F3:9E:BC ; - fixed-address 10.3.160.40; - option host-name "virthost14"; -} -host dell-r6x0-09-mgmt { - hardware ethernet 58:8A:5A:EE:EF:F0; - fixed-address 10.3.160.41; - option host-name "virthost12"; -} -host dell-r6x0-10-mgmt { - hardware ethernet 74:E6:E2:FD:78:54 ; - fixed-address 10.3.160.42; - option host-name "virthost19"; -} -host dell-r6x0-11-mgmt { - hardware ethernet 74:E6:E2:FD:6A:5A; - fixed-address 10.3.160.43; - option host-name "virthost20"; -} -host dell-r6x0-12-mgmt { - hardware ethernet 74:E6:E2:FD:76:DE; - fixed-address 10.3.160.44; - option host-name "virthost21"; -} -host dell-r6x0-13-mgmt { - hardware ethernet 74:e6:e2:fd:76:ba; - fixed-address 10.3.160.45; - option host-name "virthost22"; -} -host bvmhost-x86-08-mgmt { - hardware ethernet 4c:d9:8f:04:64:5e; - fixed-address 10.3.160.98; - option host-name "bvmhost-x86-08-mgmt"; -} -host dell-r6x0-17-mgmt { - hardware ethernet 58:8A:5A:EE:F0:02; - fixed-address 10.3.160.49; - option host-name "bvirthost12"; -} -host dell-r6x0-18-mgmt { - hardware ethernet 58:8A:5A:EE:F0:72; - fixed-address 10.3.160.50; - option host-name "bvirthost13"; -} -host dell-r6x0-19-mgmt { - hardware ethernet 58:8A:5A:F3:A1:CE; - fixed-address 10.3.160.51; - option host-name "bvirthost15"; -} -host dell-r6x0-21 { - hardware ethernet 4c:d9:8f:04:3d:1c; - fixed-address 10.3.160.53; - option host-name "qa02-mgmt"; -} -host system-22 { - hardware ethernet B8:2A:72:FC:ED:22; - fixed-address 10.3.160.54; - option host-name "vmhost-iad-09-mgmt"; -} -host vmhost-qa-04-mgmt { - hardware ethernet 74:E6:E2:F9:FF:7E; - fixed-address 10.3.160.57; - option host-name "vmhost-qa-04-mgmt"; -} -host vmhost-02-mgmt { - hardware ethernet B8:2A:72:FC:ED:64; - fixed-address 10.3.160.58; - option host-name "vmhost-02-mgmt"; -} -host backup-mgmt { - hardware ethernet C8:4B:D6:8A:39:CC; - fixed-address 10.3.160.99; - option host-name "backup01"; -} -host openqa-p09-01-mgmt { - hardware ethernet ac:1f:6b:5c:03:f9; - fixed-address 10.3.160.60; - option host-name "openqa-p09-worker01-mgmt"; -} -host openqa-p09-02-mgmt { - hardware ethernet ac:1f:6b:5c:03:69; - fixed-address 10.3.160.61; - option host-name "openqa-p09-worker02-mgmt"; -} -host svault06-mgmt { - hardware ethernet D0:94:66:45:A1:66; - fixed-address 10.3.160.132; - option host-name "sign-vault06"; -} -host qa-vmhost01-mgmt { - hardware ethernet f4:02:70:cf:c2:ca; - fixed-address 10.3.160.64; - option host-name "qa-vmhost01-mgmt"; -} -host kernel03-mgmt { - hardware ethernet d0:94:66:7c:b2:dd; - fixed-address 10.3.160.65; - option host-name "kernel-03"; -} -host vmhost-qa-01-mgmt { - hardware ethernet 58:8A:5A:F3:9C:02; - fixed-address 10.3.160.68; - option host-name "vmhost-qa-01-mgmt"; -} - -host bvmhost-a64-01-mgmt { - hardware ethernet E8:6A:64:39:18:67; - fixed-address 10.3.160.101; - option host-name "bvmhost-a64-01"; -} -host bvmhost-a64-02-mgmt { - hardware ethernet E8:6A:64:97:6B:E0; - fixed-address 10.3.160.102; - option host-name "bvmhost-a64-02"; -} -host bvmhost-a64-03-mgmt { - hardware ethernet E8:6A:64:39:18:85; - fixed-address 10.3.160.103; - option host-name "bvmhost-a64-03"; -} -host bvmhost-a64-04-mgmt { - hardware ethernet E8:6A:64:39:19:4F ; - fixed-address 10.3.160.104; - option routers 10.3.160.254; -} -host buildhw-a64-07-mgmt { - hardware ethernet e8:6a:64:39:18:99; - fixed-address 10.3.160.105; - option host-name "buildhw-a64-07-mgmt"; -} -host buildhw-a64-08-mgmt { - hardware ethernet E8:6A:64:39:18:60; - fixed-address 10.3.160.106; - option host-name "buildhw-a64-08-mgmt"; -} -host buildhw-a64-09-mgmt { - hardware ethernet E8:6A:64:39:19:35; - fixed-address 10.3.160.107; - option host-name "buildhw-a64-09-mgmt"; -} -host buildhw-a64-10-mgmt { - hardware ethernet E8:6A:64:39:19:68; - fixed-address 10.3.160.108; - option host-name "buildhw-a64-10-mgmt"; -} -host buildhw-a64-11-mgmt { - hardware ethernet E8:6A:64:39:18:B2; - fixed-address 10.3.160.109; - option host-name "buildhw-a64-11-mgmt"; -} -host buildhw-a64-12-mgmt { - hardware ethernet E8:6A:64:39:18:95; - fixed-address 10.3.160.110; - option host-name "buildhw-a64-12-mgmt"; -} -host buildhw-a64-13-mgmt { - hardware ethernet E8:6A:64:39:19:69; - fixed-address 10.3.160.111; - option host-name "buildhw-a64-13-mgmt"; -} -host bvmhost-a64-osbs01-mgmt { - hardware ethernet E8:6A:64:39:18:B3; - fixed-address 10.3.160.120; - option host-name "bvmhost-a64-osbs01-01"; -} -host bvmhost-p09-03-mgmt { - hardware ethernet ac:1f:6b:5c:03:9d; - fixed-address 10.3.160.128; - option host-name "bvmhost-p09-03"; -} -host bvmhost-p09-04-mgmt { - hardware ethernet ac:1f:6b:5c:03:94; - fixed-address 10.3.160.129; - option host-name "bvmhost-p09-04"; -} -host openqa-a64-01-mgmt { - hardware ethernet E8:6A:64:97:6B:49; - fixed-address 10.3.160.141; - option host-name "openqa-a64-01"; -} -host openqa-a64-02-mgmt { - hardware ethernet E8:6A:64:97:6B:41; - fixed-address 10.3.160.142; - option host-name "openqa-a64-02"; -} -host openqa-a64-03-mgmt { - hardware ethernet E8:6A:64:97:6B:7A; - fixed-address 10.3.160.143; - option host-name "openqa-a64-03"; -} -host bkernel02-mgmt { - hardware ethernet D0:94:66:45:8C:13; - fixed-address 10.3.160.156; - option host-name "bkernel02"; -} - -host bhwhost-a64-02-mgmt { - hardware ethernet AA:31:8D:3E:31:6F ; - fixed-address 10.3.160.244; - option routers 10.3.160.254; - option subnet-mask 255.255.255.0; -} -host svault02-mgmt { - hardware ethernet D0:94:66:45:87:C5; - fixed-address 10.3.160.133; - option host-name "sign-vault02"; -} - -host dell-630-01-mgmt { - hardware ethernet 58:8A:5A:F3:9C:56; - fixed-address 10.3.160.191; - option host-name "bvirthost14"; -} - -host dell-r6x0-16-mgmt { - hardware ethernet 58:8A:5A:EE:F2:0E; - fixed-address 10.3.160.193; - option host-name "vmhost01-stg-mgmt"; -} -host system-23 { - hardware ethernet B8:2A:72:FC:F2:2E; - fixed-address 10.3.160.55; - option host-name "vmhost-iad-10-mgmt"; -} -host vmhost-iad-11-mgmt { - hardware ethernet b8:2a:72:fc:f2:44; - fixed-address 10.3.160.56; - option host-name "vmhost-iad-11-mgmt"; -} - -host openqa-x86-worker05 { - hardware ethernet 24:6e:96:b1:4c:70; - fixed-address 10.3.174.25; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} -host openqa-x86-worker06 { - hardware ethernet 24:6e:96:b1:c8:00; - fixed-address 10.3.174.26; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-p09-01-stg-mgmt { - hardware ethernet 08:94:ef:81:30:86; - fixed-address 10.3.160.62; - option host-name "bvmhost-p09-01-stg-mgmt"; -} - -host bvmhost-p09-05-mgmt { - hardware ethernet 08:94:ef:81:30:46; - fixed-address 10.3.171.20; - option host-name "bvmhost-p09-05-mgmt"; -} - -host buildhw-a64-03-mgmt { - hardware ethernet d8:5e:d3:8b:5f:72; - fixed-address 10.3.160.80; - option host-name "buildhw-a64-03-mgmt"; -} - -host buildhw-a64-03 { - hardware ethernet 0c:42:a1:4a:0b:f4; - fixed-address 10.3.170.123; - option host-name "buildhw-a64-03"; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} - -host buildhw-a64-04-mgmt { - hardware ethernet d8:5e:d3:8b:5d:da; - fixed-address 10.3.160.81; - option host-name "buildhw-a64-04-mgmt"; -} - -host buildhw-a64-04 { - hardware ethernet 0c:42:a1:49:9b:d0; - fixed-address 10.3.170.124; - option host-name "buildhw-a64-04"; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} - -host buildhw-a64-05-mgmt { - hardware ethernet d8:5e:d3:8b:89:6e; - fixed-address 10.3.160.82; - option host-name "buildhw-a64-05-mgmt"; -} - -host buildhw-a64-05 { - hardware ethernet 0c:42:a1:5a:00:b8; - fixed-address 10.3.170.125; - option host-name "buildhw-a64-05"; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} - -host buildhw-a64-06-mgmt { - hardware ethernet d8:5e:d3:8b:5f:3a; - fixed-address 10.3.160.83; - option host-name "buildhw-a64-06-mgmt"; -} - -host buildhw-a64-06 { - hardware ethernet 0c:42:a1:45:6c:fc; - fixed-address 10.3.170.126; - option host-name "buildhw-a64-06"; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.170.254; - option subnet-mask 255.255.255.0; -} - -host openqa-a64-worker04-mgmt { - hardware ethernet d8:5e:d3:8b:73:d8; - fixed-address 10.3.160.84; - option host-name "openqa-a64-worker04-mgmt"; -} - -host openqa-a64-worker04 { - hardware ethernet 0c:42:a1:5a:08:b0; - fixed-address 10.3.174.64; - option host-name "openqa-a64-worker04"; - filename "uefi/grubaa64.efi"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -host backup01 { - hardware ethernet 6c:fe:54:57:4d:00; - fixed-address 10.3.163.40; - option host-name "backup01.iad2.fedoraproject.org"; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.163.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-x86-02-stg-mgmt { - hardware ethernet c8:4b:d6:8a:59:6a; - fixed-address 10.3.160.192; - option host-name "bvmhost-x86-02-stg-mgmt"; -} - -host vmhost-x86-09-stg-mgmt { - hardware ethernet c8:4b:d6:8a:69:a2; - fixed-address 10.3.160.42; - option host-name "vmhost-x86-09-stg-mgmt"; -} - -host bvmhost-p09-01-stg { - hardware ethernet b8:ce:f6:88:9a:de; - fixed-address 10.3.167.19; - option host-name "bvmhost-p09-01.stg.iad2.fedoraproject.org"; - next-server 10.3.163.10; - option routers 10.3.167.254; - option subnet-mask 255.255.255.0; -} - -host bvmhost-x86-riscv01 { - hardware ethernet 20:3a:43:03:d0:4c; - fixed-address 10.3.168.11; - option host-name "bvmhost-x86-riscv01.iad2.fedoraproject.org"; - filename "uefi/grubx64.efi"; - next-server 10.3.163.10; - option routers 10.3.168.254; - option subnet-mask 255.255.255.0; -} - -host openqa-p09-worker01 { - hardware ethernet 40:a6:b7:18:87:24; - fixed-address 10.3.174.42; - option host-name "openqa-p09-worker01.iad2.fedoraproject.org"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -host openqa-p09-worker02 { - hardware ethernet 40:a6:b7:18:86:b8; - fixed-address 10.3.174.43; - option host-name "openqa-p09-worker02.iad2.fedoraproject.org"; - next-server 10.3.163.10; - option routers 10.3.174.254; - option subnet-mask 255.255.255.0; -} - -# rdu3 mgmt interfaces -host autosign01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CE:FC; - fixed-address 10.16.160.134; - option host-name "autosign01.mgmt.rdu3.fedoraproject.org"; -} - -host sign-vault01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C5:BA; - fixed-address 10.16.160.132; - option host-name "sign-vault01.mgmt.rdu3.fedoraproject.org"; -} - -host buildhw-x86-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C9:7A; - fixed-address 10.16.160.12; - option host-name "buildhw-x86-01.mgmt.rdu3.fedoraproject.org"; -} - -host buildhw-x86-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C9:C2; - fixed-address 10.16.160.13; - option host-name "buildhw-x86-02.mgmt.rdu3.fedoraproject.org"; -} - -host autosign02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CE:F6; - fixed-address 10.16.160.130; - option host-name "autosign02.mgmt.rdu3.fedoraproject.org"; -} - -host sign-vault02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:65:B6; - fixed-address 10.16.160.133; - option host-name "sign-vault02.mgmt.rdu3.fedoraproject.org"; -} - -host buildhw-x86-03.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C8:F6; - fixed-address 10.16.160.14; - option host-name "buildhw-x86-03.mgmt.rdu3.fedoraproject.org"; -} - -host qvmhost-x86-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CF:02 ; - fixed-address 10.16.160.135; - option host-name "qvmhost-x86-01.mgmt.rdu3.fedoraproject.org"; -} - -host backup01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:D0:04; - fixed-address 10.16.160.99; - option host-name "backup01.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:6A:CC; - fixed-address 10.16.160.91; - option host-name "bvmhost-x86-01.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:D0:0A; - fixed-address 10.16.160.92; - option host-name "bvmhost-x86-02.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-03.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C8:FC; - fixed-address 10.16.160.93; - option host-name "bvmhost-x86-03.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-04.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CA:1C; - fixed-address 10.16.160.94; - option host-name "bvmhost-x86-04.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-05.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C8:B4; - fixed-address 10.16.160.95; - option host-name "bvmhost-x86-05.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-06.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C5:1E; - fixed-address 10.16.160.96; - option host-name "bvmhost-x86-06.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-01-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C4:E2; - fixed-address 10.16.160.191; - option host-name "bvmhost-x86-01-stg.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-02-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C7:3A; - fixed-address 10.16.160.192; - option host-name "bvmhost-x86-02-stg.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-x86-03-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C4:BE; - fixed-address 10.16.160.193; - option host-name "bvmhost-x86-03-stg.mgmt.rdu3.fedoraproject.org"; -} - -host worker01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:64:AE; - fixed-address 10.16.160.180; - option host-name "worker01.mgmt.rdu3.fedoraproject.org"; -} -host worker02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:64:84; - fixed-address 10.16.160.181; - option host-name "worker02.mgmt.rdu3.fedoraproject.org"; -} -host worker03.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:64:A2; - fixed-address 10.16.160.182; - option host-name "worker03.mgmt.rdu3.fedoraproject.org"; -} -host worker04.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CF:E6; - fixed-address 10.16.160.51; - option host-name "worker04.mgmt.rdu3.fedoraproject.org"; -} -host worker05.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:65:AA; - fixed-address 10.16.160.40; - option host-name "worker05.mgmt.rdu3.fedoraproject.org"; -} -host worker01-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C3:98; - fixed-address 10.16.160.183; - option host-name "worker01-stg.mgmt.rdu3.fedoraproject.org"; -} -host worker02-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:63:40; - fixed-address 10.16.160.184; - option host-name "worker02-stg.mgmt.rdu3.fedoraproject.org"; -} -host worker03-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:62:A4; - fixed-address 10.16.160.185; - option host-name "worker03-stg.mgmt.rdu3.fedoraproject.org"; -} - -host vmhost-x86-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C8:C0; - fixed-address 10.16.160.71; - option host-name "vmhost-x86-01.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C4:B8; - fixed-address 10.16.160.72; - option host-name "vmhost-x86-02.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-03.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:65:C8; - fixed-address 10.16.160.73; - option host-name "vmhost-x86-03.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-04.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:5F:8C; - fixed-address 10.16.160.74; - option host-name "vmhost-x86-04.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-05.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:67:1E; - fixed-address 10.16.160.75; - option host-name "vmhost-x86-05.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-01-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:68:F8; - fixed-address 10.16.160.57; - option host-name "vmhost-x86-01-stg.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-02-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:5F:AA; - fixed-address 10.16.160.33; - option host-name "vmhost-x86-02-stg.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-03-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:61:72; - fixed-address 10.16.160.34; - option host-name "vmhost-x86-03-stg.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-04-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C7:FA; - fixed-address 10.16.160.35; - option host-name "vmhost-x86-04-stg.mgmt.rdu3.fedoraproject.org"; -} -host vmhost-x86-05-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:60:B8; - fixed-address 10.16.160.36; - option host-name "vmhost-x86-05-stg.mgmt.rdu3.fedoraproject.org"; -} -host bvmhost-x86-riscv01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:69:82 ; - fixed-address 10.16.160.55; - option host-name "bvmhost-x86-riscv01.mgmt.rdu3.fedoraproject.org"; -} -host openqa-x86-worker01.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:62:63:46; - fixed-address 10.16.160.137; - option host-name "openqa-x86-worker01.mgmt.rdu3.fedoraproject.org"; -} -host openqa-x86-worker02.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C9:02; - fixed-address 10.16.160.138; - option host-name "openqa-x86-worker02.mgmt.rdu3.fedoraproject.org"; -} -host openqa-x86-worker03.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CE:12; - fixed-address 10.16.160.58; - option host-name "openqa-x86-worker03.mgmt.rdu3.fedoraproject.org"; -} -host openqa-x86-worker04.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:C4:5E; - fixed-address 10.16.160.53; - option host-name "openqa-x86-worker04.mgmt.rdu3.fedoraproject.org"; -} -host openqa-x86-worker05.mgmt.rdu3.fedoraproject.org { - hardware ethernet D0:46:0C:61:CA:22; - fixed-address 10.16.160.54; - option host-name "openqa-x86-worker05.mgmt.rdu3.fedoraproject.org"; -} -host centos-x86-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet A8:3C:A5:4C:C1:C1; - fixed-address 10.16.160.69; - option host-name "centos-x86-02.mgmt.rdu3.fedoraproject.org"; -} -host centos-x86-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet A8:3C:A5:4C:22:BF; - fixed-address 10.16.160.70; - option host-name "centos-x86-02.mgmt.rdu3.fedoraproject.org"; -} - -# power10 in rdu3 - -host bvmhost-p10-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet 08:94:ef:85:2e:a6; - fixed-address 10.16.160.139; - option host-name "bvmhost-p10-01.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-p10-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet 08:94:ef:85:3d:82; - fixed-address 10.16.160.140; - option host-name "bvmhost-p10-02.mgmt.rdu3.fedoraproject.org"; -} - -# aarch64 in rdu3 - -host bvmhost-a64-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:20:b2; - fixed-address 10.16.160.101; - option host-name "bvmhost-a64-01.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-a64-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:25:a2; - fixed-address 10.16.160.102; - option host-name "bvmhost-a64-02.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-a64-03.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:23:02; - fixed-address 10.16.160.103; - option host-name "bvmhost-a64-03.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-p10-04.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:25:82; - fixed-address 10.16.160.104; - option host-name "bvmhost-p10-04.mgmt.rdu3.fedoraproject.org"; -} - -host buildhw-a64-01.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:24:36; - fixed-address 10.16.160.112; - option host-name "buildhw-a64-01.mgmt.rdu3.fedoraproject.org"; -} - -host buildhw-a64-02.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:21:a6; - fixed-address 10.16.160.113; - option host-name "buildhw-a64-02.mgmt.rdu3.fedoraproject.org"; -} - -host openqa-a64-worker01.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:24:92; - fixed-address 10.16.160.114; - option host-name "openqa-a64-worker01.mgmt.rdu3.fedoraproject.org"; -} - -host openqa-a64-worker02.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:25:66; - fixed-address 10.16.160.142; - option host-name "openqa-a64-worker02.mgmt.rdu3.fedoraproject.org"; -} - -host bvmhost-a64-01-stg.mgmt.rdu3.fedoraproject.org { - hardware ethernet d8:5e:d3:e6:25:9a; - fixed-address 10.16.160.119; - option host-name "bvmhost-a64-01-stg.mgmt.rdu3.fedoraproject.org"; -} -## End of file diff --git a/roles/dns/files/named.conf b/roles/dns/files/named.conf index 7a11afa72b..5aa1f4b134 100644 --- a/roles/dns/files/named.conf +++ b/roles/dns/files/named.conf @@ -20,7 +20,6 @@ acl "everyone" { 0.0.0.0/0; ::0/0; }; // acl "ns_redhat" { 66.187.233.210; 209.132.183.22; 209.132.183.30; 209.132.183.2; 66.187.229.10; }; // -acl "iad2net" { 10.3.160.0/19; }; acl "rdu2net" { 172.31.1.0/24; 172.31.2.0/24; }; acl "rdu3net" { 10.16.160.0/19; 10.1.102.0/24; }; acl "rh-slaves" { 10.11.5.70; }; @@ -94,246 +93,6 @@ controls { inet 127.0.0.1 port 953 allow { localhost; } keys { rndckey; }; }; -view "IAD2" { - match-clients { iad2net; rh-slaves; 192.168.0.0/16; }; - allow-recursion { localhost; iad2net; rh-slaves; }; - recursion yes; - // no rate-limit on internal requests - rate-limit { - exempt-clients { iad2net; rh-slaves; }; - }; - - # make sure we forward only for redhat.com lookups - zone "redhat.com" { - type forward; - forward only; - forwarders { 10.2.32.1; 10.11.5.19; 10.38.5.26; 10.68.5.26; }; - }; - - zone "projectatomic.io" { - type forward; - forward only; - forwarders { 8.8.8.8; 8.8.4.4; }; - }; - - zone "beaker-project.org" { - type forward; - forward only; - forwarders { 8.8.8.8; 8.8.4.4; }; - }; - - # also, we need to forward some jboss.org for fuse-fabric/bugzilla2fedmsg - zone "jboss.org" { - type forward; - forward only; - forwarders { 8.8.8.8; 8.8.4.4; }; - }; - - # We can't access the internal Zanata servers. Just use external - zone "zanata.org" { - type forward; - forward only; - forwarders { 8.8.8.8; 8.8.4.4; }; - }; - - # We can't access the softwarefactory-project.io. because ns1/ns2 give unroutable ips. Need to use external - zone "softwarefactory-project.io" { - type forward; - forward only; - forwarders { 8.8.8.8; 8.8.4.4; }; - }; - - zone "3.10.in-addr.arpa" { - type forward; - forward only; - forwarders { 10.2.32.1; 10.11.5.19; 10.38.5.26; 10.68.5.26; }; - }; - - zone "4.10.in-addr.arpa" { - type forward; - forward only; - forwarders { 10.2.32.1; 10.11.5.19; 10.38.5.26; 10.68.5.26; }; - }; - - zone "5.10.in-addr.arpa" { - type forward; - forward only; - forwarders { 10.2.32.1; 10.11.5.19; 10.38.5.26; 10.68.5.26; }; - }; - - zone "10.in-addr.arpa" { - type forward; - forward only; - forwarders { 10.2.32.1; 10.11.5.19; 10.38.5.26; 10.68.5.26; }; - }; - - zone "186.132.209.in-addr.arpa." { - type forward; - forward only; - forwarders { 10.39.144.11; 10.69.144.11; 10.11.191.1; }; - }; - - zone "phx2.fedoraproject.org" { - type master; - file "/var/named/master/built/phx2.fedoraproject.org.signed"; - }; - zone "iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/iad2.fedoraproject.org.signed"; - }; - zone "rdu3.fedoraproject.org" { - type master; - file "/var/named/master/built/rdu3.fedoraproject.org.signed"; - }; - zone "mgmt.iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/mgmt.iad2.fedoraproject.org"; - }; - zone "stg.iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/stg.iad2.fedoraproject.org"; - }; - - zone "stg.rdu3.fedoraproject.org" { - type master; - file "/var/named/master/built/stg.rdu3.fedoraproject.org"; - }; - - zone "mgmt.rdu3.fedoraproject.org" { - type master; - file "/var/named/master/built/mgmt.rdu3.fedoraproject.org"; - }; - - zone "mgmt.rdu-cc.fedoraproject.org" { - type master; - file "/var/named/master/built/mgmt.rdu-cc.fedoraproject.org"; - }; - - zone "rdu2.fedoraproject.org" { - type master; - file "/var/named/master/built/rdu2.fedoraproject.org"; - }; - - zone "s390.fedoraproject.org" { - type master; - file "/var/named/master/built/s390.fedoraproject.org"; - }; - - zone "0.16.10.in-addr.arpa" { - type master; - file "/var/named/master/built/0.16.10.in-addr.arpa"; - }; - - zone "102.1.10.in-addr.arpa" { - type master; - file "/var/named/master/built/102.1.10.in-addr.arpa"; - }; - - zone "2.31.172.in-addr.arpa" { - type master; - file "/var/named/master/built/2.31.172.in-addr.arpa"; - }; - - zone "160.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/160.3.10.in-addr.arpa"; - }; - zone "161.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/161.3.10.in-addr.arpa"; - }; - zone "162.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/162.3.10.in-addr.arpa"; - }; - zone "163.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/163.3.10.in-addr.arpa"; - }; - zone "164.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/164.3.10.in-addr.arpa"; - }; - zone "165.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/165.3.10.in-addr.arpa"; - }; - zone "166.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/166.3.10.in-addr.arpa"; - }; - zone "167.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/167.3.10.in-addr.arpa"; - }; - zone "168.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/168.3.10.in-addr.arpa"; - }; - zone "169.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/169.3.10.in-addr.arpa"; - }; - zone "170.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/170.3.10.in-addr.arpa"; - }; - zone "171.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/171.3.10.in-addr.arpa"; - }; - zone "172.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/172.3.10.in-addr.arpa"; - }; - zone "173.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/173.3.10.in-addr.arpa"; - }; - zone "174.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/174.3.10.in-addr.arpa"; - }; - zone "175.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/175.3.10.in-addr.arpa"; - }; - zone "176.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/176.3.10.in-addr.arpa"; - }; - zone "177.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/177.3.10.in-addr.arpa"; - }; - zone "178.3.10.in-addr.arpa" { - type master; - file "/var/named/master/built/178.3.10.in-addr.arpa"; - }; - - zone "fedoraproject.org" { - type master; - file "/var/named/master/built/IAD2/fedoraproject.org.signed"; - }; - - zone "cloud.fedoraproject.org" { - type master; - file "/var/named/master/built/IAD2/cloud.fedoraproject.org.signed"; - }; - - zone "getfedora.org" { - type master; - file "/var/named/master/built/IAD2/getfedora.org.signed"; - }; - - zone "pagure.io" { - type master; - file "/var/named/master/built/IAD2/pagure.io"; - }; - - include "/etc/named/zones.conf"; -}; - view "RDU2" { match-clients { rdu2net; 192.168.0.0/16; }; allow-recursion { localhost; rdu2net; }; @@ -417,19 +176,6 @@ view "RDU2" { type master; file "/var/named/master/built/phx2.fedoraproject.org.signed"; }; - zone "iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/iad2.fedoraproject.org.signed"; - }; - zone "mgmt.iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/mgmt.iad2.fedoraproject.org"; - }; - - zone "stg.iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/stg.iad2.fedoraproject.org"; - }; zone "mgmt.rdu-cc.fedoraproject.org" { type master; @@ -769,23 +515,10 @@ view "RDU3" { file "/var/named/master/built/RDU3/pagure.io"; }; - zone "iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/iad2.fedoraproject.org.signed"; - }; zone "rdu3.fedoraproject.org" { type master; file "/var/named/master/built/rdu3.fedoraproject.org.signed"; }; - zone "mgmt.iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/mgmt.iad2.fedoraproject.org"; - }; - - zone "stg.iad2.fedoraproject.org" { - type master; - file "/var/named/master/built/stg.iad2.fedoraproject.org"; - }; include "/etc/named/zones.conf"; }; diff --git a/roles/flatpak-cache/templates/squid.conf b/roles/flatpak-cache/templates/squid.conf index e61378ecd2..272695bbf7 100644 --- a/roles/flatpak-cache/templates/squid.conf +++ b/roles/flatpak-cache/templates/squid.conf @@ -1,5 +1,5 @@ -acl openqa src 10.3.174.21-10.3.174.64 -acl batcave src 10.3.163.35 +acl openqa src 10.16.174.21-10.16.174.64 +acl batcave src 10.16.163.35 acl proxies src 10.128.4.1 acl SSL_ports port 443 diff --git a/roles/haproxy/files/ipa.production-iad2.pem b/roles/haproxy/files/ipa.production-iad2.pem deleted file mode 100644 index a3e3ad5f93..0000000000 --- a/roles/haproxy/files/ipa.production-iad2.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQsFADA8MRowGAYDVQQKDBFGRURP -UkFQUk9KRUNULk9SRzEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4X -DTE2MTAxMzEzMDQ0NloXDTM2MTAxMzEzMDQ0NlowPDEaMBgGA1UECgwRRkVET1JB -UFJPSkVDVC5PUkcxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0eTCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLFCPrsPD3YW/yzvId7UsWCq/Ac -cD7IOtlt46slTa490TvfpwzB1IwA3H0LTEYV7LONMIxJIT8H4H2P7A/S4eDtA6sZ -s26Qp+3YLj+jHOwvNiONG5YBIn6vgUKc1SdwyuQsNwcGsH1nV2vXrKYz4ccMud1P -tzzwRMSWgwZLXcLvMMXYpDCxu4pVmgEtTnYz7Dii7MJ2aJsWEuslzjL6HjaegfGD -JjXCrqmNKcgbgD7fQq05wiYw8AbArjhfObDO626b4naB0VxLb9vGTDBaRbIeL7Or -nM11BWVqYAFFRZPL1jXkeb9Bpr9oj4PduRq6+tSZPa3wgtnoowAN2AqLHKMCAwEA -AaOBsDCBrTAfBgNVHSMEGDAWgBQVrijBhrLB6xwkwjZroAlWJGIpvDAPBgNVHRMB -Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBxjAdBgNVHQ4EFgQUFa4owYaywescJMI2 -a6AJViRiKbwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vaXBh -MDEucGh4Mi5mZWRvcmFwcm9qZWN0Lm9yZzo4MC9jYS9vY3NwMA0GCSqGSIb3DQEB -CwUAA4IBAQAZE5ZVf2MROtRR2O00ecXwl3vBE72xw87EQdAQ6J9sDjug5YrVW6OU -OfaRoVLyBSi5uPgj2RZ9VePdGNSDZ66DhspPtmbWcW0M1X2QPXwWQ/Idj3MfKE33 -b+V4A6T55p1kxXniNl0KZHlDVMECltwRBkd9mjr3LgWzk/EgqyiP56xrWEsvKUyv -ZMvoyFky2/BaNTN8KOposjDQZwR5sqE/CJzm/QJPg/6zQ4/tkFDOc7ZqIVkfIqoY -sycNYLLakqCV59xuJ2uDbV8Sn8LbH5+e3Px0mapnVxn8fJAPcCqDOmXJ5TVkVYlH -nYYOskqEw5stHYuEwujR2uXo8vfmIMpZ ------END CERTIFICATE----- - diff --git a/roles/haproxy/files/ipa.staging-iad2.pem b/roles/haproxy/files/ipa.staging-iad2.pem deleted file mode 100644 index 41a3ac678c..0000000000 --- a/roles/haproxy/files/ipa.staging-iad2.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEqTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQsFADBAMR4wHAYDVQQKDBVTVEcu -RkVET1JBUFJPSkVDVC5PUkcxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0 -eTAeFw0yMTAyMTExMzExMDBaFw00MTAyMTExMzExMDBaMEAxHjAcBgNVBAoMFVNU -Ry5GRURPUkFQUk9KRUNULk9SRzEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9y -aXR5MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0MzQ9OVg4KTEs2Go -ASwcW1z/tJc60x7HG5VFC6EWft3MPH1p4APLJ/BZ4F/+ChHbbG35NTig0qK0SiLY -ct8Gyw66FoB2KQvks/1kCXuQquLnMCm9aEFAjlNDtUh9kcGrrjCfP4duwT6p/dl0 -Hue9J/FrCXfrxn3GSwizjC2ZZZV/sL3iDh3p2eBDksXpjGgQuDu2n+0g5U0dsNhM -9EYRkX2J/veESS3zpYDwRVHPwxIqmEGrK0wroqXwRZVf25HdsmP4B65Iz3aQKeXE -plLtZ6P99YfORQvu9GLhcgLPl5RQpvRBGacpyzGLhXqpAIl31PyurC+9yAvLANFl -Ncxf8ycvHGoOtiRPAbmWW+P+weuonmesHn8n3PV6JXcUkGoSFdfXw0MDAhLHCGQx -8DyrOZ8zskWdBzFxdCOIS/COnvUWBsjF6hzuUgIk3Ho89LyBYKZm1oC+ICTg94Au -dE1MOZQ1A9RllN3LP1dHPiAdrtBduWPsCYcnmgeiHH+jLr2tAgMBAAGjga0wgaow -HwYDVR0jBBgwFoAUQyunEUCOlySo2y3+sFr7ivM5yG8wDwYDVR0TAQH/BAUwAwEB -/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0OBBYEFEMrpxFAjpckqNst/rBa+4rzOchv -MEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAYYraHR0cDovL2lwYS1jYS5zdGcu -ZmVkb3JhcHJvamVjdC5vcmcvY2Evb2NzcDANBgkqhkiG9w0BAQsFAAOCAYEADVXs -3iTxDA7cA6TDKfjs3GrHk94LnnLxAIKTubYEw1UZmVcx++JCy2uUc7Zorgq5WkNP -xmqrKqhJTV6BzoVVhFxdof+ro3qW80dRcAtUm9heqr8HBGjoRMa/mMlDs7nb/0AH -XLe7UWYGW3qoxxUIeMWL1U736agWVFxRSe4ng8uvrGac7tK0tW3oiAkId3PwL6BM -jLaoMsfXFOK13GAP2P/VnuLDMJN6taR2BGQkqi7oZ9DmR6HcqG4MtYBiQgLhvH75 -JsKC/ROLtlC/gbShsy5WDy3Dbo/Ei8QMqhudQrtNlQeNUXASm8rUvkJmeIspTzPD -fOywhVygYiyIvigGOmiuwtfpPQaPHOWsosgkwmzq104wnv2ILaQ8+oYf617bxldR -9d6l8OMOiYqt34fLbMSw15G+OEnl7t96USuCXIihVTU1Ykqmruhn/O4EeXd9QiIr -7qlGcnKJpxwLCmHBtw3kv8PgK9EjGQpLPFTPiIP0rSHTVTQFUb8IY+tGG0jz ------END CERTIFICATE----- diff --git a/roles/haproxy/files/ocp.prod-iad2.pem b/roles/haproxy/files/ocp.prod-iad2.pem deleted file mode 100644 index ecc624cbae..0000000000 --- a/roles/haproxy/files/ocp.prod-iad2.pem +++ /dev/null @@ -1,162 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDMjCCAhqgAwIBAgIIFVLcqdn8j4wwDQYJKoZIhvcNAQELBQAwNzESMBAGA1UE -CxMJb3BlbnNoaWZ0MSEwHwYDVQQDExhrdWJlLWFwaXNlcnZlci1sYi1zaWduZXIw -HhcNMjEwOTA4MDEyNzI2WhcNMzEwOTA2MDEyNzI2WjA3MRIwEAYDVQQLEwlvcGVu -c2hpZnQxITAfBgNVBAMTGGt1YmUtYXBpc2VydmVyLWxiLXNpZ25lcjCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBANHLCw940eNvGsEy0sByld0497rcAwhr -GaHQNXS4kTtb6Q3QUb4BZtX5J6Yl1RARAJXSw8bhasYIkkNQdAtXsksWusuhjJaX -mf8KO8G1tLfi+pV7E0g28cZELVKLnzSd4fdSnVgckFZguhcK88TOgPkqtEeGNUs2 -TeXBa8cvOaAXx9v2eeieLTh4OSU8DTJiXFC9Cww7YW/kfCt8e59e8KFSL61ANdHv -0eEFzpbLqGKz8n+BGzF74ljTlNj6bh5I7S/l5IGietHJXokxDDtge+f5Z61NH8OK -/+z+UV991lAzpSeJhpDwTPshLAo6YHpxfmL+cvhp4j597GC4Bwc8B7sCAwEAAaNC -MEAwDgYDVR0PAQH/BAQDAgKkMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEye -4jaMIASQCAZs3KJL+i5of8zIMA0GCSqGSIb3DQEBCwUAA4IBAQDJPtkQSJdffoXH -7UOmmPIuZHNMs7B3E1ioEoJ6Y7IDdQVEZ0krzYxk+iwOMJ9qoXGDODm6qx6pOxFf -wseNApd9NypDR2Ynj6lk6ZMgG0vBcaH5BzbkQkTE+9AEv5NsnNe1gkWm/gA/vhJ1 -A81GGa3ejirxZtFOGhckF4oj7UvdlQJrzlDv5WnVQ0Qwbq2wv85F3dS/L9fvsGjy -DoqyCpx7Sf8xbyscz7X3LcgyndCD41gX9zkBmHgtxOBGPK13ePPCDg8lbVs4/paa -rGLUx9q9xhbHuI2V/vg4vzxLe7BzEKZUD9oBDtBC8kPO91eNnF92xWFCRrRRo9c0 -+O8eABzK ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDQDCCAiigAwIBAgIIQH0s8ESC7M8wDQYJKoZIhvcNAQELBQAwPjESMBAGA1UE -CxMJb3BlbnNoaWZ0MSgwJgYDVQQDEx9rdWJlLWFwaXNlcnZlci1sb2NhbGhvc3Qt -c2lnbmVyMB4XDTIxMDkwODAxMjcyNloXDTMxMDkwNjAxMjcyNlowPjESMBAGA1UE -CxMJb3BlbnNoaWZ0MSgwJgYDVQQDEx9rdWJlLWFwaXNlcnZlci1sb2NhbGhvc3Qt -c2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqC53BqjrQ8T -YpuknrpM6Q8laitIE1i5OYNbsH1vlqSRNiHPrLo9P39I4asXJDOUWxlWUPWDm/M9 -U86KYlxAEqZGOaVJe65xSEhi8ZL3NFHeRH0sjQTqmDkKLj6ZZm7OUWylDpj4Fn34 -Zm5mQZ/V8v7fbpz6r7wQzes1rNDgNXd+NONfPCOc8mFhVisV3jT20t8i6TNLv8A6 -Ko9ku3FyTSFrRYdSVEcrzUwKLtW8z6aDTPHCCRPGDQnv4lsHS1GwJLYQKiGXHfv+ -PyfwS81B+te7PQ9vomTL8vQQeehSwL18xrSTVmwnS82lxjRKPueeChKWvIpAxzfn -KZLiEkwNqQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUQYTNR8YBk+OCAxjSMMf/AW74VdcwDQYJKoZIhvcNAQELBQAD -ggEBAAaACZ4ZUS3Iu8kmTFeI+Nfb78WcMV1btLqNY72LZvWdYe+9MT9BXZc5Bb7C -Osyr65uLPuBlSr8LkvZtnBDf90bju9ORrZtZ+YZ1+oIXEvkcTX1S2jQeAJQrDpoo -ShaiGX1lT28LiHyboyou4KYDNZaGdl4bViUpH9LEgAvMv5fzClB9KgHtpsvM+KeS -niMS+hxAxGS61NuqAqVMJ8Z8x1s5m21jlvUlV0X6ugAh5Qq/0Vw3mQdsqWDm9egV -/MveLZ42MTt9nfKz43eWhUuFGPlosghK1VM+V36zfGrFSm8p2fJ2vJqv8C2/YcbK -5qvcQfz2f6OguN5pTJDiG9B6mh8= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDTDCCAjSgAwIBAgIIfIJCm8eXIR0wDQYJKoZIhvcNAQELBQAwRDESMBAGA1UE -CxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2aWNlLW5l -dHdvcmstc2lnbmVyMB4XDTIxMDkwODAxMjcyNloXDTMxMDkwNjAxMjcyNlowRDES -MBAGA1UECxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2 -aWNlLW5ldHdvcmstc2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAwS/aIR3bEmEc8lLxxH9cHysm2tN9xHDphcjbv/RPHKqlCPy6GMbkAHDkMVjA -Nh1aAqEvBM4o+G0+gMBW2sIIaKGiY7+3HNq8/IzjPY1yWMcSV18ikNqhivKxhfKw -41JvJLwbYnAcDqzV1VF3DLYlCBblB3wZjil2B1/BcM9PpJRhz8+mERLXnGngEgJ7 -UI5TUPUD8alzBVfJBpjiQOoxNzkMV/JKd42U8Fd411BX3hoKRUMc7IbsYNabeQZ9 -zpW1pP1Xsv67uYvBdSzn7qFWEE1X0xuMX+HobA7ijnu1wcngkxSJWPhY2AxAk257 -06JYT5EKhzP+bj5KvTokSwDvCQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYD -VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU9l/rvLW1Us+HhEiiCx5u0s+qkIYwDQYJ -KoZIhvcNAQELBQADggEBAEt/qQsvXNRlcxTLPx8dQATQGdmvaiorwetxDX40H+ed -58b0lhZyyfCxn3uEEpRoUAzIq5k9sX39/A83H8dpCx7C5B/1mW5aloF5OX61mAKJ -ax0zGFer3K179zEwjtsT34c/ar2L92L5k/tKRwXirfNt4QtmhxD5WcjXFCPb+F1U -LMkojimKbCR+tqOyX6N7Rsz2OctjNETZBhvNSOVhdgmkxWQHDJZQd4K3FJBoTfHQ -+aGcQ1dzzf7q4LCLpjcl4f2U9xiMX/WldUWk/TEdi95c9An7dAiBfEIBp6zv/IyZ -BjpKi8xQskTZtl98Vl7qhRan7YNEFceI4TFAV34T+SY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDlzCCAn+gAwIBAgIIFbF3hsy9sQowDQYJKoZIhvcNAQELBQAwWTFXMFUGA1UE -AwxOb3BlbnNoaWZ0LWt1YmUtYXBpc2VydmVyLW9wZXJhdG9yX2xvY2FsaG9zdC1y -ZWNvdmVyeS1zZXJ2aW5nLXNpZ25lckAxNjMxMDcwOTA1MB4XDTIxMDkwODAzMTUw -NFoXDTMxMDkwNjAzMTUwNVowWTFXMFUGA1UEAwxOb3BlbnNoaWZ0LWt1YmUtYXBp -c2VydmVyLW9wZXJhdG9yX2xvY2FsaG9zdC1yZWNvdmVyeS1zZXJ2aW5nLXNpZ25l -ckAxNjMxMDcwOTA1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTsh -+vuyQtm1gxonDOcTu9bHzMtsmcjtvMUGRoNmOKzkuZ/83T3YPWRGlpHz1Cd6VPVg -/cjKjS+tATMsiUiZ68hhXMiABpnLJ5t2elEveCinvWo+hsL5E9YmPJSnZBnRHkEe -ZIMDw6pUkPmbe4CdxrskgOywh3+P5+4AfktueXkSOGFG/0h+LIZsfjWt00Rz6ljr -GDMl4QipJZRKQCDMjpKAfByImo1MW9l5jJhf97esgJFS/jt7AEhyVvBccXzRgK1j -RBw4li8TIEPkXtf/liISq7mQEMr4nrDkIinwcEn6aKikHt7sf8SRsW1WzAiBbbAy -/gui4iPvSs8Ce8ucMwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/ -BAUwAwEB/zAdBgNVHQ4EFgQUaroRgLs+tvxTXsbETCNKDnjSVz4wHwYDVR0jBBgw -FoAUaroRgLs+tvxTXsbETCNKDnjSVz4wDQYJKoZIhvcNAQELBQADggEBAIN08oyS -Y4fJ7bM9Cx8V/V0ADt1urIxWT0hovf+NBVqtTKOuPG5L/pBxjDFb30iZlYDdSVhh -8QYbZ1xljCKeB4+NyTvSb9pqgJJflVgj9LqfdFWcthnIXa7TuiynA1iak/rgYCU5 -1+k7t6bC88BQ3SmuljpF7VmV7IC4FC7dbEY/OkRKpz2IGWg4d5qzrkiKKthnVvD6 -ELNLItkH5TcwIFIc1/W6bDc3Fb1AgBO/hbYYAQ9enVrvcdOReHAB809S4TcH/l62 -CLabYFuzdpeHbOXaU2RZJTohxZ1NUZnWvOdsJ4u9sl/qmWZsO6eEk8QwongP+i+S -b7yHBinGWRYKslI= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDbzCCAlegAwIBAgIIdw5QnDjkHmYwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UE -AwwbaW5ncmVzcy1vcGVyYXRvckAxNjkxNzUwNTIzMB4XDTIzMDgxMTEwNDI1MVoX -DTI1MDgxMDEwNDI1MlowJzElMCMGA1UEAwwcKi5hcHBzLm9jcC5mZWRvcmFwcm9q -ZWN0Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMj0gch9pHpn -C7D1gUjG/SCBbEWeyix/67yIxY4ZVetQ1fydFv+fUa6AUiRGlkkWZlD62Zw8HLjl -zoo/AydUTlBJf2FdST74VBoj66LhmO+yaTfYu6GHNKICLYG1xgjumbCYfEC3gNcg -9IdSg+qd0q01gVyLJfmhLn2qYTKWwqHkCrl66uMJhqh0J7novuoV60Urq4tFDzAn -f2e3q4UL6PYuIZbyc6f+Wexgv4iNVPkxNSAhI+hdhF0cH7tN56I0u745AIoURxLG -JoV69UCYqdC+YX/8kXBxtFqK2Leww68+Bf8Eyg668OycS4V9xFrLx/xgrpBAQhqU -DQ22Sf2Mf60CAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYI -KwYBBQUHAwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUV5EnWEsrP8Bu5hMMfqT7 -n70vJOMwHwYDVR0jBBgwFoAUWu/P9QuKjsg6uP9N0hrzEF4ZrKcwJwYDVR0RBCAw -HoIcKi5hcHBzLm9jcC5mZWRvcmFwcm9qZWN0Lm9yZzANBgkqhkiG9w0BAQsFAAOC -AQEABQmF4kxgbmJ83HGMWMpbkNxn6qOeugfhxigQ3TUxFWmivJlOpFwhTDBQ3Z3H -pTJDCRMZgvRaBi2IVPL52UdbJ4TYxeLDiE5j66OmyorA0HoYHol5HuU8Flqeh81O -1I5zuZ1afr19h8gmjOKVK+s73YU5piOziEXf50ptDvpGF54zLQcmYP4VVmTd9yMV -rvEs9f1jFzKEdLbj2tcAMh1OPGLmWJgmijWtEG/SgIKgjvoXXsD3D7GdAbtaFS05 -EeZbddX6yl2uT4xgppk8EkgNLsIBEXbRQ68cgjxaykZUl3Cfwyi2jAT2eIZAkHTP -vJifDpHKVAWvIFkI81ErWmU68g== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDDDCCAfSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtpbmdy -ZXNzLW9wZXJhdG9yQDE2OTE3NTA1MjMwHhcNMjMwODExMTA0MjAyWhcNMjUwODEw -MTA0MjAzWjAmMSQwIgYDVQQDDBtpbmdyZXNzLW9wZXJhdG9yQDE2OTE3NTA1MjMw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3I6UODXqxOmyKuP85XRI9 -Ix0r7eekGbwHrol6rqCNLBlB73HcUTJwPDLxxnYo4ZadZ6HqPXyvm7l7UbCiFREs -ZMWWBdJWA1hpDsVJuT9YDA+GG7/kLBHRdxQwssT2Q59ePfMcO0/nq7vFHlmXSW3p -S403ulrjW9BtZHVCoNh/PJ3thkByHf/bxPuHDh8fkwhMdYFdXsY3c+qWytkfITLX -cpzKvuihFJOr79623fNGgzARkyBDMTjJKJUxTw6ZiBuk5430W1F+zlHx33mUXHm9 -DJp0NDjAsFx7/J44aC2E7OHLAKwUTA6kNVCWiQRVjWEcPkCRArCzGNGc3JB6P7l1 -AgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEAMB0G -A1UdDgQWBBRa78/1C4qOyDq4/03SGvMQXhmspzANBgkqhkiG9w0BAQsFAAOCAQEA -iWDgIkBVd8fTVTuMQy9W7xVhAsRutTr224w1/TLKYh9qxDzr+m5SG/DW/S4ko/9h -3EsCnOafi3n2/Em+eZK6r4lHip8iKMDJBNQ6Ma/d9OOcR0nI9v+z0u9hdqUyFKVl -ECZiLa0+0/oD++HUPj8z6PxInz/qQ5evHWSe2BAQD5HTKhQgzU0loR+655yDIyEg -MuO+wbvb+OMXDHdf4SrCBq3NX8SztyA5QggdvfBmPPANnf0/pCibuxxFpckdFeQh -uKzXnftoVGywZXNvzGfYuEMd3gcf4vCvZt55I1FTfSxsdgsZTiIIBbNDGXkoLobQ -eLtOiyjvpTg3CSFJ1Mu4Xw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDUTCCAjmgAwIBAgIISaZzLQ0wlEIwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UE -Awwrb3BlbnNoaWZ0LXNlcnZpY2Utc2VydmluZy1zaWduZXJAMTYzMTA3MDkwNTAe -Fw0yNDEyMDYwMzE5MzVaFw0yNzAyMDQwMzE5MzZaMDYxNDAyBgNVBAMMK29wZW5z -aGlmdC1zZXJ2aWNlLXNlcnZpbmctc2lnbmVyQDE2MzEwNzA5MDUwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDozDS4lS5rr1p9SHoCt7xSTK75dHrvZedN -aDAxovq0DzHL+O9rrJhBJztdG1DdEjI0l+tP8UWkz9eW4pgy2Eky7jeEYQtrEJGv -FX5rMFY8eB/FakOB77iDUHj8O1uA7ojZwtBEJOHhA0dgB4woWdVRH0NXAmdeWjwu -6dAUzLagGkVTMykEAeKI8LkOsPfeKB/o//3BJLOLsfHq2NROcJ6h6FhJ4ssnb/GV -hSbqEct/n2RT5UoAZzch8bhYSO2Rohgz1QNZ7KsHMK0z+3P8ilZnTCXFBzhvzoWP -PxlRe75GlgpU3/mhX1WGGoAXYxKHdAtRQliVg3M77ooMIPPT0AOTAgMBAAGjYzBh -MA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTegybX -MybyRicJQovba6+Xkkp+oTAfBgNVHSMEGDAWgBTegybXMybyRicJQovba6+Xkkp+ -oTANBgkqhkiG9w0BAQsFAAOCAQEAKV45efjGeVU81vUcqMni1Ky8zPH4lYMtOuXA -sJyQl8v+eCacOeOhxuw/jcGw+Rq3lnYgbkk0ofNWGVJvr3GRkPJaWvD2+l2qPHGk -FGfeoj8vl/zq5Ifwb850z+RuQz006wrESxB0zdW9Os1Z/A+GxYEF0p11GkBVYSLA -RmmyFooxWGNwMdCqiadzFlSF6iV7u+nSLCM0RGR81rXcekXlvppEcQJ1Ba5g/1g4 -Cb1HBoLb7fzt45Jk12HFYk4/d6XeV5DRxxZQ45WX/2sicC65WyNVkSloeLw+DQxn -6LdlksLZW5tnntMHMZ+GbMMR79sHp+fQy6ItzFuwjdn41SEgpg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDUTCCAjmgAwIBAgIII8AbIcbUXrswDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UE -Awwrb3BlbnNoaWZ0LXNlcnZpY2Utc2VydmluZy1zaWduZXJAMTYzMTA3MDkwNTAe -Fw0yMzExMDcwMzE1NDBaFw0yNjAxMDUwMzE5MzZaMDYxNDAyBgNVBAMMK29wZW5z -aGlmdC1zZXJ2aWNlLXNlcnZpbmctc2lnbmVyQDE2MzEwNzA5MDUwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLjaC7mVwVfRITNNwX9pVlvhDQR8bXYZCm -MdlJh66pIggVtVG2pLjUO+ILNX+2IFPiea/MFF4X2MOJgGUF8YvXFfLhZn9wXfIW -w9jRN8P0Yek1Li5UkkypjOeATi1P2vczT10Wa1vzYAKqIzPLgA6rJOUnePTczBk2 -HP5RNTyJvjuBgMsHLQFN/1HEWC9hYP7vJ7FjbajMAyNFmU388jMteGfSn70Og6Mq -pacVJKXaoqtFrUQy9KkSswiD2PjdXwB4ktBi9PMc+z1yJAtr5ba5UXY8gQKFLnXY -zYAvG5ncesZCAoADfdJyRtDExlEGy2I91q6PGOFMg2XjVrqEULnrAgMBAAGjYzBh -MA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQrg+kf -R9eqfLMYjlFgjfge/mVbNTAfBgNVHSMEGDAWgBTegybXMybyRicJQovba6+Xkkp+ -oTANBgkqhkiG9w0BAQsFAAOCAQEAIZ8TV8CH+IMLk+CsgMORX28E+VbFpyDpv2Q6 -yJKzrXO5yRg6GVP3Jgq+DoHUMuzyfGn5yxRcr6RX59OgrApJ+S+T8btTH3tXLysX -aNIstXOgdO0ej0XxjdR7cTP0cyCyqDJwJubaiinHFRMdcVSQ9Ywlz9yIyKYvk3AB -xK4EWbQOj5Y/6RCH0c1y0Dz3saeQiaI3df2pJZCg82xxkWxaOwuVE4D9BUm3f6uK -Y6pQoc3uFqhjafAcqiOB88ZiwYWjC/6c83b91mOTkDiGk0ldSKc8mUzEMyiLj/2n -9hdlgVo/7XK9tD9LOqQ3mfLCL93EEhRh3L5K+l0+jFiLrSBdiA== ------END CERTIFICATE----- diff --git a/roles/haproxy/files/ocp.stg-iad2.pem b/roles/haproxy/files/ocp.stg-iad2.pem deleted file mode 100644 index 6c9a740820..0000000000 --- a/roles/haproxy/files/ocp.stg-iad2.pem +++ /dev/null @@ -1,162 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDMjCCAhqgAwIBAgIIaPdwKWDT4UYwDQYJKoZIhvcNAQELBQAwNzESMBAGA1UE -CxMJb3BlbnNoaWZ0MSEwHwYDVQQDExhrdWJlLWFwaXNlcnZlci1sYi1zaWduZXIw -HhcNMjEwODExMDIwNTIyWhcNMzEwODA5MDIwNTIyWjA3MRIwEAYDVQQLEwlvcGVu -c2hpZnQxITAfBgNVBAMTGGt1YmUtYXBpc2VydmVyLWxiLXNpZ25lcjCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKicSo+XRr6wfZbEBbtioO5KVnvBvMbW -X+WpwL3jIFxbKqtMLdZJHEAzHwGM26A03ojJNXSaaRSZ8NfTVKH8sVVFfGZJrHKe -ktLwQKmoJNIoEpsPsdgSXt1Lxpg7GCcAdW4tLOTKg/NHvlgY1TwdlOpAibtZTIkP -AiUkooa+o8YD81lAwubboGjW9ed1p+9s4+XIu9BkF3pYoFSufN2NkgAt7EnYslzF -Y5xrVJj6y9YlxpWt4N3eyIl8wtqNYDF8AcDe3PfuTZcx9UfHbYYvGqJ+S+ZCIs1e -/eAY4SMuI4LMN1xn9ayR3Q1ORQjUouiXlxZyEdBtVe6Su3NHc0jtaecCAwEAAaNC -MEAwDgYDVR0PAQH/BAQDAgKkMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLBn -hOJ+MYMsAWB9wZPbx9PEtdImMA0GCSqGSIb3DQEBCwUAA4IBAQBb3koXUVBC3ryw -EvgsMLMCSzz7AiYTb7TgcPxYMMAnQTUwQ4Lvv5FPN5HGC26ywWX3ho1YFPFiiD5F -8Df3cia2LWRjRsIh6wpi9azaljmJk57MlyCOQz0CStaM4uBT/vOq8xDenftdYwnP -U3EYiHSc2phB39Vsy7HkmrxXTjtVBw+cS33W+t3od+v1Rh2h8GhhB9OfqoY5Hz8u -Mx8rdGmdrW1R0GjjOo6A40HiC8o9s4gF8ahxBYtQq3HJOqzPgE1BGhDoQlhl/3iy -q//4k4hhrTOK/9h7ocnRoyOKQluGGKk/gFLqeb7g4WS7wLzQmyZq2Y2H8DxSFW6D -3UizPi6M ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDQDCCAiigAwIBAgIISSysQB1WSXowDQYJKoZIhvcNAQELBQAwPjESMBAGA1UE -CxMJb3BlbnNoaWZ0MSgwJgYDVQQDEx9rdWJlLWFwaXNlcnZlci1sb2NhbGhvc3Qt -c2lnbmVyMB4XDTIxMDgxMTAyMDUyMloXDTMxMDgwOTAyMDUyMlowPjESMBAGA1UE -CxMJb3BlbnNoaWZ0MSgwJgYDVQQDEx9rdWJlLWFwaXNlcnZlci1sb2NhbGhvc3Qt -c2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyKriy0Sm4qFH -F1UR1h/LJhNzQslMk0iqamPYH1PmM3K6yy97W1JbFlmHY62GkSgGd6Yn/HdbrE9r -cVm0ep51L66YJtvxFr+t/9VQrQRp9YsCsoYs0JYu80x5lvPA+rMNvLtcF01ICUTD -SsXC+U0Ax8z9DQ3BLZdSFw6XkKSgL2hoYrtm0s5QlNP7UQxdifORCzLWs8ShzIWm -Z3tBQujKj5oIEa2aW0cDkCwjphfWIPGBJ2Dgkijv3wGESzTTaoS4akWFshrUNh2w -HxZ1McePtcNHrKExlNkkTWqKkmiPLu2QCzkgxmQPZuRL0dh5Erq9s6yKKnqwwT/E -XcmtQXJ8pwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUadqeaJR5leHUvEe0FkBnwFdWNAIwDQYJKoZIhvcNAQELBQAD -ggEBAKeh3sU7mW9Hy2AF5RTNOKKdAjF+O8q3tJQgFnhylrkMiPPg9xtyPwmjd5+N -gG++Kl8FdeGulvv2rNyFHX5JsUe0G/zFTBVA/7Y/6vwCw5kL/icTMVc46Ll5DGpW -w2XmovB/q04yB2Kxm6eTQXIufk7XluRxUPbSLnFIEWAXbPJXy9HZXtdh6lsV7XzZ -/0BmrrXSMU9Ci+Y2R+Hvblngwcly+24YIBPF8mqXdvEN5SpJoa9m+Twqrr7C37+C -FRy0N1KunwURAtXxiqa1771rOXJTApuGBC4qMJHU0zWYDjFld6DmltFD3089K1RC -7UQO6wpSnbJ1rvj/MLbcqhzy2iQ= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDTDCCAjSgAwIBAgIIPSZvGEbaSakwDQYJKoZIhvcNAQELBQAwRDESMBAGA1UE -CxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2aWNlLW5l -dHdvcmstc2lnbmVyMB4XDTIxMDgxMTAyMDUyMloXDTMxMDgwOTAyMDUyMlowRDES -MBAGA1UECxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2 -aWNlLW5ldHdvcmstc2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEArRVi35loWRJprLpbAvUCqUonme90k+TX0mH6w3hGXq+gHacjTXu56wvaDCRB -NRFXpBF2D+HwFe+ruwf5CL1+tTdPhV718+EoulHNkKceWlEbC/1gUciLIimoZECN -fYBSdRbZiDGedybR0/CffIUDCtyTw0Rzy5IGv66dwRLi6DnMRC/4VC3zoAiE7qjv -0ltzyyMY6A1rdC0sn3JlZMhn7dAso66lFAmBHz+uLqozECzZgGB+p3WxiHIXclBm -2vxpIx2gENaErzjVpdcW9upy/kWE8pBBia7Q9gH7m46e5rgzlohq8hX12wjN+qmY -HvHDwfC9FJenK+TMTW4iPPlFKwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYD -VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWSSxxbCJPTA10bsVRevE6NBFMp8wDQYJ -KoZIhvcNAQELBQADggEBAJsNuwneDrRqI3cbkyPgOFSL8iDxd+Tz9JkCD0eHGBkv -5XhNOIFxR1d5d/TOqi+MRFRRYwsXllFkXZqJ1Zc0b2VVQOJzl8FaeR5KPsDWw2M3 -vg4o05Telpau/p7ChjWc79R1SfR9uL8fMRjvttZuSo50x02l1HXOrik7Tj1tJyx1 -ygu/zL1C7mSdHK0YzuPG8+ZLr6zhPgDKsu7s7FX7bc+0NuFkBteBrtjmjvJLfY74 -3x4pcxLL1gd7sOtBPy4R/eV1B1eD2//73XRulTrPBVxW69POWg3mW4mLLsVfIKjF -/upFz2a+Jv711tsW+A+h+lvgWBf3k3kzkalXTZ2Rsz0= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDlzCCAn+gAwIBAgIIT6AM8LrnSMAwDQYJKoZIhvcNAQELBQAwWTFXMFUGA1UE -AwxOb3BlbnNoaWZ0LWt1YmUtYXBpc2VydmVyLW9wZXJhdG9yX2xvY2FsaG9zdC1y -ZWNvdmVyeS1zZXJ2aW5nLXNpZ25lckAxNjI4NjUwNjgwMB4XDTIxMDgxMTAyNTgw -MFoXDTMxMDgwOTAyNTgwMVowWTFXMFUGA1UEAwxOb3BlbnNoaWZ0LWt1YmUtYXBp -c2VydmVyLW9wZXJhdG9yX2xvY2FsaG9zdC1yZWNvdmVyeS1zZXJ2aW5nLXNpZ25l -ckAxNjI4NjUwNjgwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqQhK -uIZaLrqRs5sF8Wj/iUy9lIbVDWbkeDJ9hu/sUFJSFoga3Gq2J/M9ZPekky6sefBR -kKhXCl3nnlnkmpWOqPXNmlb5t+rLLY6nTUJW64D8nrKRz16rSq1ne+zcLvR0xqxc -fVXDAD+jm4PyKbYG3OVC19M96ViMh2lru4hVFN3774WJdKZo0ykhAsU+kqNW9/dO -TUP5QA/ZR+reREQX8VCdQQWklhr8zfWszjyBebqQC4OvjiHs1JsD1YMr6snyVOaQ -2IZh8wsW4TcOaT43ACg8jbOI0Xq58sMey6ecCdalUxc54KD33+4FnbFdq+c2Ivbq -Lm8dQAWt7oV126BkLQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/ -BAUwAwEB/zAdBgNVHQ4EFgQUTDihmnoBLKesm1gAHU8/txY0dcAwHwYDVR0jBBgw -FoAUTDihmnoBLKesm1gAHU8/txY0dcAwDQYJKoZIhvcNAQELBQADggEBADtpAnez -uYs+/F0yZWCk0SqTlVR0c1HTInkAzUqOBUKgddDaxT2oTer4BMTcwp+zvZDciwG3 -hzJPZcMVFyD/paolxDQQv6/mDrH7Wm62ZEuc/mdBgj+SvTS69h8dxjseiYsKZlb6 -ORp2M5fzHV3SlbC8lhrIo/T8HS6vN6Gr8EUsdNUlGpO8P8UDb5Y8/Wy29v3ejtOW -TGl37jzXbEvANnBjDgjc0ig0SCpiw7jxgHGXn/0/St26pnZZwIi2r6vsxdOWB84X -8W7WQ2k7FOVhAulU1JU82OXnHE+dvR1qBI/K/wmUW4fuC+o/u7X9C2UO55FLh1bk -GNzlRIRV99SUddQ= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIIYIUzM7v9sQUwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UE -AwwbaW5ncmVzcy1vcGVyYXRvckAxNjkxNzQ3Njk3MB4XDTIzMDgxMTA5NTU1MFoX -DTI1MDgxMDA5NTU1MVowKzEpMCcGA1UEAwwgKi5hcHBzLm9jcC5zdGcuZmVkb3Jh -cHJvamVjdC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDikjE+ -e/HLRQJSP3iKAgddmL9qxAsSp92MQzy/xqKAO5lyzL0i8rVrAT8/wgTHrnsSlvQX -WY89uN87MjmCabFVBH0+i9NqXzqt0/SRwxkvyvF8hp55VEDCI2TJupRGmpbjUfzW -Fr8jT4/+beP1Nw3YD/4iSfQiVpaKwD/JPhLrhBGSmlwrYDGwxvpSw1MX6lzRxuaK -4PjOYrRth6jtLDwMoObtvdWBwAYKWa+WnLWTksZ3ndqAiIXRneJ6Y1oytuWdQHVz -C4MMyjQWhtv6nqjioZrptp6ebRAH12KnyHQpfHS+DhmnGQSxZGh4g4aK6TMKPLMa -tFIgX3obylQD9f8zAgMBAAGjgaMwgaAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQM -MAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDfo9sd8oC+UpNO/ -RcfKCMMbyPBNMB8GA1UdIwQYMBaAFFyvqK+ZUGmOuDf7cG/TmQu/cWtQMCsGA1Ud -EQQkMCKCICouYXBwcy5vY3Auc3RnLmZlZG9yYXByb2plY3Qub3JnMA0GCSqGSIb3 -DQEBCwUAA4IBAQAD5np6HGggOob8u+B/mFcE0awkpl5o4TzQku40wpbXitN2HJJp -h+kQeNJ6L91IzyrS5Nk3zxJnJdRlvmO0pbknZy0kaxfaNGHe7k4uQ0ZfahVGQSYO -PHv7OUx/ds53gMz/VwvM+ZvXO6+Bsbj57AbNGzMGnXgqZd7h4UcxcvlXUA7Isc82 -zBI0EY9fppvkjtSnbK+DVfYqXBq7NLeOYh2VMOt7eSVXkOwpoAgIBJl/EgEX50D+ -WDpEyQG6bROVyv7aa8roPQFiMTYD97Vqhb0zJZdgCvD4TmCdzh80IqCnlz6qzrch -n6okyAYa2bK6mcEqIro0T1US4GuqvIu1fb90 ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDDDCCAfSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtpbmdy -ZXNzLW9wZXJhdG9yQDE2OTE3NDc2OTcwHhcNMjMwODExMDk1NDU2WhcNMjUwODEw -MDk1NDU3WjAmMSQwIgYDVQQDDBtpbmdyZXNzLW9wZXJhdG9yQDE2OTE3NDc2OTcw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbpLD/Kk+cRD7PPiXQP4sU -shYVs2xQww9YxiQq/esyFpKrR8KJxFIqKNKgXapyFur0buRK2Y6tJF3inSjGqaWh -ZbBEvjQPIbSPEFGeB0PO8tpgkDvKi2pRCi9IEcFikSZfhIYAIz9YED1uwJdqv12V -QQZLw7A8Fll33lIZWyxSyLuzZehahWAz3d6Ls/FNwtHuw7STBwDyDtO+i2iUYSxZ -i2Vnr425/L0G2udRhv0Fpse+semw/6Q4cNjb3iqKwmXkpKfEmHzXLvzV/tOujLJQ -fDjavkLbU7jwwGUa0n5mfw6OuVbNtS4fPy8GEquCUdOPu+Oiw5pqfhKzIzspYkEP -AgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEAMB0G -A1UdDgQWBBRcr6ivmVBpjrg3+3Bv05kLv3FrUDANBgkqhkiG9w0BAQsFAAOCAQEA -S8UuoKw9I88RoSyEVcT60j+l1mrISplsOTmJILBuhPekcxGxKcQ2M9tXyVh8+RNR -BJj0x2h1ixsoXkUZQkpf+Vznqu526Ijk3pbQGEmHMau6hBHGMer9BDzSmeu2VWF9 -qeesBOh97lyMdKp6lYKJ06vDhPzcJ7DgysXzVVBBCIq6XPVW2q/nsTJEZ42gJMJa -hZQIcukcYkVJlBuVeoyRmZx6jTN/eh+OeG2M5ju+GTPSPTqO9TPycCFPKvmnPWvh -LAz4KIm7zQye/J2ZC2BWhWcIUdI9MyP9sCQ3lIXbTQnB9cE1XRbhoO6kvZKJRw6i -nOnHEmxC/4KpvZE0XTSlVA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDUTCCAjmgAwIBAgIIPiyx7QT5EpEwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UE -Awwrb3BlbnNoaWZ0LXNlcnZpY2Utc2VydmluZy1zaWduZXJAMTYyODY1MDY4MjAe -Fw0yNDExMDgwMzAwMjFaFw0yNzAxMDcwMzAwMjJaMDYxNDAyBgNVBAMMK29wZW5z -aGlmdC1zZXJ2aWNlLXNlcnZpbmctc2lnbmVyQDE2Mjg2NTA2ODIwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE37FtjAyE8SZdX7EqAzZQZ3+2C086Npu9 -oC18n1AzjQ82AYyBWJu9y+s73++NB6pohAlnLothxp2SWYw40OFianXfCXI0qTb4 -UECEu5m+/1kBPeZid1rrNE4zUHJfg83bfHmSoXwPLm6Oe22dWxvQNQjmObZpUdE7 -GgE6vGklhOGxLv89/2RcLgWMsQwVc/0RqPrhr8//0XxPjHN2LhXD8rib7OnwFCtw -ZktAJs3Ybv+9Mrqw3kz9Ve6pZYJBUUoOHZHXr5xr14DToOo7VRWCr2vrlAdE37fe -aJ5wGa67edJAOLGSMDhG0jbRNayMfmh1e0M0gED8Iatk/X3d3/AzAgMBAAGjYzBh -MA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTsL3bF -xaLUeq8uEzvDHcAFgPjQXjAfBgNVHSMEGDAWgBTsL3bFxaLUeq8uEzvDHcAFgPjQ -XjANBgkqhkiG9w0BAQsFAAOCAQEAdwvISJBxzmejcy59rpCZKBmmGgJUQ6KP9GdK -FMATO3Wa0rBoo+1oscCUUGcV5mtdzCQ1+Fq8tuT+XIR5JfywsYg/zQ0E7DP9FGea -6Xq8J9VFYV0G+aAc8CawPPsXhap18VLyx4o1zQhGreYn0AcCTaX+mTJoV/Xwo3ER -INirejjgIGe3gX6NMkioB8sNrm26X2R80W9T8jPOrd0WRfD8vdqvizxO693PowRn -Pcs249fxAPl/FFKxsZt9w0dHRmyOD5zJ/wzNdq4aXRiswOUeA1C+JZyBoMovcJ68 -zTP7rg34wc2N7zYt0+O9YaRKUiPIyWwr6TdVIabWbv9y3UcW+Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDUTCCAjmgAwIBAgIIO1LiL4m6IikwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UE -Awwrb3BlbnNoaWZ0LXNlcnZpY2Utc2VydmluZy1zaWduZXJAMTYyODY1MDY4MjAe -Fw0yMzEwMTAwMjU4MjVaFw0yNTEyMDgwMzAwMjJaMDYxNDAyBgNVBAMMK29wZW5z -aGlmdC1zZXJ2aWNlLXNlcnZpbmctc2lnbmVyQDE2Mjg2NTA2ODIwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrRfhniwtN60CnvYHbu5Dw49pG2H+HXcpb -etkVW1dsVEuY+hro9q/cLA3ndQwbudx8Jm+4EdtfoxDrbz7Am3As5AgmybKG/Lrt -Ta/RCn8HRZO/m4qxvEjHQLDzOgUuS9i19j05D4/3cm1pVxnatoueL0wVazDTStBz -JJIN+DRA3xe2LbpLjgkjRJsGWi/cBNn5ok+1XwTkWsZnBJ5eEnSgN1klilSS746C -zqNBGZReWD0/3KIHMmdKzvo+47R4pCnJCdZMvxRRzDZc/1qKa2iZjpUivA3D+Y+6 -6cxJeWyQ7b3FFk20h4K8ljBC46NDoN1Y2P6eJ3iO2UHnlbMcnCTXAgMBAAGjYzBh -MA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRGeYw2 -6mY0m4rS0KIC6a721+X2pDAfBgNVHSMEGDAWgBTsL3bFxaLUeq8uEzvDHcAFgPjQ -XjANBgkqhkiG9w0BAQsFAAOCAQEABhK1q2GUnUGDuSOjpN/TgQC1J17Lb3xxn1Bz -1CyNideTZkJISNpLJbgqJLWq1tLIep4bGUgUEubIgNNNQR2sjmAq3jHmo43X66uf -C4TqFjg+CQEdFZKPqH4ZBd9a70I352Cg/upxzRN+L/MggZ/8yBroAtzJlnPeA1QP -o0c4KKn5LX13jmilV7n40rieJ8Rf1PRin1nDvPRinYJlpjh46W2+5YsOCxHub/1x -h7MLZlFAY76EDBzQLQKOqviO+/jklHa1skqG6IF1PJGaQS5DrmF8KuP5H6Nm13GA -sWxgVkyiASh0fk8N6SiDdeXZXGLlR4en327bHHjBPGA3T0iECg== ------END CERTIFICATE----- \ No newline at end of file diff --git a/roles/haproxy/files/os-master.production-iad2.pem b/roles/haproxy/files/os-master.production-iad2.pem deleted file mode 100644 index 262df43438..0000000000 --- a/roles/haproxy/files/os-master.production-iad2.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC6jCCAdKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtvcGVu -c2hpZnQtc2lnbmVyQDE1ODk4MjEwODIwHhcNMjAwNTE4MTY1ODAxWhcNMjUwNTE3 -MTY1ODAyWjAmMSQwIgYDVQQDDBtvcGVuc2hpZnQtc2lnbmVyQDE1ODk4MjEwODIw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwVl9/ZFwYKvginudHP+f7 -TFJgl45NWnmzc6aDPZDcCcfXZ1P8KtAa1GHBQ77ItJ5w2/lNx5PWoQAyAJrddXSZ -NlPxteLQe0c31rgR0++/UFFmcAnQ7WncBsPxJPFrFSEU5FF3faY5p9lGTVcwxvi3 -4eEKj9d3Yupr4osxeKaHwAM7r4Oq1iVApLsliNMXbXX0w7ihf3RPQonOoCK0oa+l -4DDdoCzARTi2q+H1tm5SmfJRpEXwaYOqTCH/Od1HbL+YmdJFoqfhcjEn+Bzg6VdR -U+MDNx71MQ3sROOpejyH51iZ0QK75zv1RtTIeylGGDa94g5tbRb7a5FJgRe39/jZ -AgMBAAGjIzAhMA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MA0GCSqG -SIb3DQEBCwUAA4IBAQB99T9a8/ZLnDmWZopX8Jhgv8umqNVW8nhgFOlFOJ6YsiXs -p9fDIUSU5m1/ZEJv0NIMMorLG49SoAxWrh4LwzlPc5fAT6PwHEZQRAAfu4oNjGzI -1KkERtyJqb+8KUFflTUQZubOBeK8enp9t2oSqnmFTN1NvMHAjuDYLqL2/pRqAdxx -vlRcqgyEoGRf98dX4tFrO1sTd6ivadOjITzRFJTXihR+DahV4a06nJYAbT52rLJJ -czzA/7vXY1XRUbRNtnPOI57b6Y/R/XQeWmX2C8TM8ogF/q+d7AG40LZB1xBJRNOY -38lIpCfLG9PuQwwl6M76zgrrjaPwDEsk6VGOSEhI ------END CERTIFICATE----- diff --git a/roles/haproxy/files/os-master.staging-iad2.pem b/roles/haproxy/files/os-master.staging-iad2.pem deleted file mode 100644 index 9d047deb78..0000000000 --- a/roles/haproxy/files/os-master.staging-iad2.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC6jCCAdKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtvcGVu -c2hpZnQtc2lnbmVyQDE1OTYxNTI0ODIwHhcNMjAwNzMwMjM0MTIyWhcNMjUwNzI5 -MjM0MTIzWjAmMSQwIgYDVQQDDBtvcGVuc2hpZnQtc2lnbmVyQDE1OTYxNTI0ODIw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrsJV6TboYpAy9yyCWPvAs -47hn044pMTj3RW7V7rMN7685ciqIyX3fPbigRi3PmsaRZdFKNy3WHfh2j/yEio2N -TdcrfmeRSjRKaG+i2sm/hqwB09EHXjrMl2Yu6y/DLUFShfA/QSDxJ4PKnHFb57QS -swCZ8E1LAynqeRHtppj4XiOtgpQ4Zp7xth9PtcVEfG4lrfp5t6xNyoyXm62Vx+7P -Da2pa9v3m1yjokhG0jtGSdIH8FBLRrgRa5rw/hCkyGaudazuh9JhLdQ8D3adZF+l -dRxr51Pfs3hXMYjG+y6iyN62BC+d2ZgM5lcc0WhN71vPiCrY2LD2w1epDbdFV+Z7 -AgMBAAGjIzAhMA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MA0GCSqG -SIb3DQEBCwUAA4IBAQAYLyXIIUwlURq8aslsyUog8HA9cfa4t+16S2n80/up5xIL -twgq3CdmIAks0jFl8QfA3aDVLdyS75iuHvjGkw8QeXRSyCP7Uw9e+IPJcmU3900t -VU/O5t72c1/e7M86kWylBYmwaPaWskGZ5HjKANZiO7iaJqH8HFm5fiMb5NNQfoUV -o4bR8yoWFe+/fdRAgdma8+rAUfevXpwwY6f+lKYSh6+DCC0qhu78rX8pjJPZB687 -2pPewSwiUGo/VZoE4t2F72PdWf05HL7M11JsvS/V6AYmQmBhB1dH2w9nCuX4eCM/ -DtMeh4fDVmQ7i8ib5ozO8btxP8L4zCdgiGYBuIDQ ------END CERTIFICATE----- diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index b1f81635d8..ac3192ba6f 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -36,7 +36,7 @@ dest={{ item.dest }} owner=root group=root mode=0600 with_items: - - { file: "ipa.{{env}}-iad2.pem", dest: /etc/haproxy/ipa.pem } + - { file: "ipa.{{env}}-rdu3.pem", dest: /etc/haproxy/ipa.pem } - { file: "ocp.{{env_short}}-rdu3.pem", dest: "/etc/haproxy/ocp-{{env_short}}.pem" } - { file: "ocp.{{env_short}}-rdu3.pem", dest: "/etc/haproxy/ocp-{{env_short}}-rdu3.pem" } tags: diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 587f312e47..6b2f19c527 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -35,33 +35,6 @@ backend stats-backend stats enable stats uri / -{% if env == "production" and 'iad2' in inventory_hostname %} -frontend ocp-masters-kapi - mode tcp - bind 0.0.0.0:6443 - default_backend ocp-masters-backend-kapi - -backend ocp-masters-backend-kapi - mode tcp - server ocp01.ocp.iad2.fedoraproject.org ocp01.ocp.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check - server ocp02.ocp.iad2.fedoraproject.org ocp02.ocp.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check - server ocp03.ocp.iad2.fedoraproject.org ocp03.ocp.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check -# temp bootstrap node -# server bootstrap.ocp.iad2.fedoraproject.org bootstrap.ocp.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check - -frontend ocp-masters-machineconfig - mode tcp - bind 0.0.0.0:22623 - default_backend ocp-masters-backend-machineconfig - -backend ocp-masters-backend-machineconfig - mode tcp - server ocp01.ocp.iad2.fedoraproject.org ocp01.ocp.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check - server ocp02.ocp.iad2.fedoraproject.org ocp02.ocp.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check - server ocp03.ocp.iad2.fedoraproject.org ocp03.ocp.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check -# temp bootstrap node -# server bootstrap.ocp.iad2.fedoraproject.org bootstrap.ocp.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check -{% endif %} {% if env == "production" and 'rdu3' in inventory_hostname %} frontend ocp-masters-kapi mode tcp @@ -90,33 +63,6 @@ backend ocp-masters-backend-machineconfig # server bootstrap.ocp.rdu3.fedoraproject.org bootstrap.ocp.rdu3.fedoraproject.org:22623 weight 1 maxconn 16384 check {% endif %} -{% if env != "production" and 'iad2' in inventory_hostname %} -frontend ocp-masters-kapi - mode tcp - bind 0.0.0.0:6443 - default_backend ocp-masters-backend-kapi - -backend ocp-masters-backend-kapi - mode tcp - server ocp01.ocp.stg.iad2.fedoraproject.org ocp01.ocp.stg.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check - server ocp02.ocp.stg.iad2.fedoraproject.org ocp02.ocp.stg.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check - server ocp03.ocp.stg.iad2.fedoraproject.org ocp03.ocp.stg.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check -# temp bootstrap node -# server bootstrap.ocp.stg.iad2.fedoraproject.org bootstrap.ocp.stg.iad2.fedoraproject.org:6443 weight 1 maxconn 16384 check - -frontend ocp-masters-machineconfig - mode tcp - bind 0.0.0.0:22623 - default_backend ocp-masters-backend-machineconfig - -backend ocp-masters-backend-machineconfig - mode tcp - server ocp01.ocp.stg.iad2.fedoraproject.org ocp01.ocp.stg.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check - server ocp02.ocp.stg.iad2.fedoraproject.org ocp02.ocp.stg.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check - server ocp03.ocp.stg.iad2.fedoraproject.org ocp03.ocp.stg.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check -# temp bootstrap node -# server bootstrap.ocp.stg.iad2.fedoraproject.org bootstrap.ocp.stg.iad2.fedoraproject.org:22623 weight 1 maxconn 16384 check -{% endif %} {% if env != "production" and 'rdu3' in inventory_hostname %} frontend ocp-masters-kapi mode tcp @@ -274,18 +220,16 @@ backend oci-candidate-registry-backend balance hdr(appserver) server oci-candidate-registry01 oci-candidate-registry01:5000 check inter 10s rise 1 fall 2 -{% if 'iad2' in inventory_hostname or 'rdu3' in inventory_hostname %} +{% if 'rdu3' in inventory_hostname %} -# Only enable this on iad2 proxies +# Only enable this on rdu3 proxies frontend src-frontend bind 0.0.0.0:10057 default_backend src-backend backend src-backend balance hdr(appserver) -{% if env == "staging" %} - server pkgs01 pkgs01:80 check inter 10s rise 1 fall 2 -{% elif datacenter == 'rdu3' %} +{% if env == "staging" or datacenter == 'rdu3' %} server pkgs01 pkgs01:80 check inter 10s rise 1 fall 2 {% endif %} option httpchk GET / @@ -302,7 +246,7 @@ backend ipa01-backend server ipa01 ipa01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem option httpchk GET /ipa/ui/ -{% if env == "production" and 'iad2' in inventory_hostname or 'rdu3' in inventory_hostname %} +{% if env == "production" and 'rdu3' in inventory_hostname %} frontend kojipkgs-frontend bind 0.0.0.0:10062 default_backend kojipkgs-backend diff --git a/roles/hosts/files/bastion01.iad2.fedoraproject.org-hosts b/roles/hosts/files/bastion01.iad2.fedoraproject.org-hosts deleted file mode 100644 index 88c4d3a8f7..0000000000 --- a/roles/hosts/files/bastion01.iad2.fedoraproject.org-hosts +++ /dev/null @@ -1,4 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.3.163.31 bastion01.iad2.fedoraproject.org -10.3.163.11 vmhost-x86-01.iad2.fedoraproject.org diff --git a/roles/hosts/files/koji01.stg.iad2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.iad2.fedoraproject.org-hosts deleted file mode 100644 index 42f31a4a49..0000000000 --- a/roles/hosts/files/koji01.stg.iad2.fedoraproject.org-hosts +++ /dev/null @@ -1,4 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 - -10.5.128.120 db01.stg.phx2.fedoraproject.org db-ask db-elections db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-fedocal tagger_dbdb-summershum db-tahrir db-notifs db-kerneltest diff --git a/roles/hosts/files/ns13.rdu2.fedoraproject.org-hosts b/roles/hosts/files/ns13.rdu2.fedoraproject.org-hosts index 70250bb32d..ded0cbb4aa 100644 --- a/roles/hosts/files/ns13.rdu2.fedoraproject.org-hosts +++ b/roles/hosts/files/ns13.rdu2.fedoraproject.org-hosts @@ -1,9 +1,9 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -38.145.60.11 gateway.fedoraproject.org gateway +38.145.32.11 gateway.fedoraproject.org gateway # Map canonical names of IPA servers to their VPN IP addresses -192.168.1.156 ipa01.iad2.fedoraproject.org -192.168.1.157 ipa02.iad2.fedoraproject.org -192.168.1.162 ipa03.iad2.fedoraproject.org +192.168.1.156 ipa01.rdu3.fedoraproject.org +192.168.1.157 ipa02.rdu3.fedoraproject.org +192.168.1.162 ipa03.rdu3.fedoraproject.org diff --git a/roles/hosts/files/proxy01.iad2.fedoraproject.org-hosts b/roles/hosts/files/proxy01.iad2.fedoraproject.org-hosts deleted file mode 100644 index 849c10d456..0000000000 --- a/roles/hosts/files/proxy01.iad2.fedoraproject.org-hosts +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 diff --git a/roles/hosts/files/proxy10.iad2.fedoraproject.org-hosts b/roles/hosts/files/proxy10.iad2.fedoraproject.org-hosts deleted file mode 100644 index 849c10d456..0000000000 --- a/roles/hosts/files/proxy10.iad2.fedoraproject.org-hosts +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 diff --git a/roles/hosts/files/proxy101.iad2.fedoraproject.org-hosts b/roles/hosts/files/proxy101.iad2.fedoraproject.org-hosts deleted file mode 100644 index 849c10d456..0000000000 --- a/roles/hosts/files/proxy101.iad2.fedoraproject.org-hosts +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 diff --git a/roles/hosts/files/proxy110.iad2.fedoraproject.org-hosts b/roles/hosts/files/proxy110.iad2.fedoraproject.org-hosts deleted file mode 100644 index 849c10d456..0000000000 --- a/roles/hosts/files/proxy110.iad2.fedoraproject.org-hosts +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 diff --git a/roles/hosts/files/vpn b/roles/hosts/files/vpn index 9505cf1f5b..fe6a760640 100644 --- a/roles/hosts/files/vpn +++ b/roles/hosts/files/vpn @@ -2,6 +2,6 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 # Map canonical names of IPA servers to their VPN IP addresses -192.168.1.156 ipa01.iad2.fedoraproject.org -192.168.1.157 ipa02.iad2.fedoraproject.org -192.168.1.162 ipa03.iad2.fedoraproject.org +192.168.1.156 ipa01.rdu3.fedoraproject.org +192.168.1.157 ipa02.rdu3.fedoraproject.org +192.168.1.162 ipa03.rdu3.fedoraproject.org diff --git a/roles/hosts/tasks/main.yml b/roles/hosts/tasks/main.yml index 727305a2c1..2550e237a1 100644 --- a/roles/hosts/tasks/main.yml +++ b/roles/hosts/tasks/main.yml @@ -9,7 +9,7 @@ # This will move a /etc/hosts in place if it's setup in files for that host/domain # Note that if it's not set it will just skip this play and do nothing. # -- name: Setup /etc/hosts for some clients that are not on the vpn or are and in iad2 +- name: Setup /etc/hosts for some clients that are not on the vpn or are and in rdu3 ansible.builtin.copy: src={{ item }} dest=/etc/hosts with_first_found: - "{{ inventory_hostname }}-hosts" @@ -18,12 +18,12 @@ - "{{ ansible_domain }}-hosts" - "{{ datacenter }}-hosts" - "{{ hosts_base | default('base') }}" - when: not vpn or ( vpn and datacenter == 'iad2' ) + when: not vpn or ( vpn and datacenter == 'rdu3' ) tags: - config - hosts -- name: Setup /etc/hosts for some clients on the vpn, that are not in iad2 +- name: Setup /etc/hosts for some clients on the vpn, that are not in rdu3 ansible.builtin.copy: src={{ item }} dest=/etc/hosts with_first_found: - "{{ inventory_hostname }}-hosts" @@ -32,7 +32,7 @@ - "{{ ansible_domain }}-hosts" - "{{ datacenter }}-hosts" - "{{ hosts_base | default('vpn') }}" - when: vpn and datacenter != 'iad2' + when: vpn and datacenter != 'rdu3' tags: - config - hosts diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf index 0733a061c7..00c296386b 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.00-ipa.conf @@ -7,8 +7,8 @@ RequestHeader edit Referer ^https://id\{{env_suffix}}\.fedoraproject\.org/ https # Require ip 192.173.156.2 # nb # Require ip 208.96.144.68 -# internal iad2 networks: -# Require ip 10.3.0.0/16 +# internal rdu3 networks: +# Require ip 10.16.0.0/16 # ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 b/roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 deleted file mode 100644 index 1ba6aba53f..0000000000 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 +++ /dev/null @@ -1,64 +0,0 @@ -{% if 'iad2' in inventory_hostname %} -{% if rewrite %} -RewriteEngine On -RewriteRule ^{{remotepath}}$ %{REQUEST_URI}/ [R=301] - -{% endif %} -{% if header_scheme %} -RequestHeader set X-Forwarded-Scheme https early -RequestHeader set X-Scheme https early -RequestHeader set X-Forwarded-Proto https early - -{% endif %} -{% if header_expect %} -RequestHeader unset Expect early - -{% endif %} -{% if keephost %} -ProxyPreserveHost On -{% endif %} - -{% if balancer_name is defined %} -SSLProxyEngine On - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "ws://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "ws://{{ member }}" - {% endif %} - {% else %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "wss://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "wss://{{ member }}" - {% endif %} - {% endif %} - {% endfor %} - - -RewriteEngine on -RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC] -RewriteCond %{HTTP:Connection} Upgrade [NC] -{% if remotepath is defined and remotepath != "/" %} -RewriteCond %{REQUEST_URI} ^{{ remotepath }}/(.)* -{% endif %} -RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P] - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - BalancerMember "http://{{ member }}" - {% else %} - BalancerMember "https://{{ member }}" - {% endif %} - {% endfor %} - -ProxyPass {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -ProxyPassReverse {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -{% endif %} -{% else %} -Redirect 421 / -{% endif %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.flatpak-cache.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.flatpak-cache.conf index a6a2e2ee25..05edf35b0a 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.flatpak-cache.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.flatpak-cache.conf @@ -1,4 +1,4 @@ -ProxyRemote "*" "http://worker01.ocp.stg.iad2.fedoraproject.org:31444" +ProxyRemote "*" "http://worker01.ocp.stg.rdu3.fedoraproject.org:31444" ProxyRequests On @@ -7,6 +7,6 @@ ProxyPreserveHost On RequestHeader set X-Forwarded-Proto "https" RequestHeader set X-Forwarded-Port "443" -ProxyPass / http://worker01.ocp.stg.iad2.fedoraproject.org:31444 -ProxyPassReverse / http://worker01.ocp.stg.iad2.fedoraproject.org:31444 -RemoteIPHeader X-Forwarded-For \ No newline at end of file +ProxyPass / http://worker01.ocp.stg.rdu3.fedoraproject.org:31444 +ProxyPassReverse / http://worker01.ocp.stg.rdu3.fedoraproject.org:31444 +RemoteIPHeader X-Forwarded-For diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf index fe10320761..cf11367b44 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf @@ -42,7 +42,7 @@ ProxyPreserveHost On Require valid-user -{% if datacenter == 'iad2' or datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf index b91ff1daf8..ac643a9ddb 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf @@ -20,8 +20,6 @@ RewriteRule .* - [F] RewriteCond %{REQUEST_URI} ^/koji/rpminfo.*$ RewriteRule .* - [F] -{% if datacenter == 'iad2' %} -{% include "reversepassproxy.conf-nonopenshift-iad2" %} -{% elif datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} {% include "reversepassproxy.conf-nonopenshift-rdu3" %} {% endif %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf index dadd11ef82..e74fe7783f 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf @@ -31,7 +31,7 @@ ProxyPreserveHost On {% endif %} -{% if datacenter == 'iad2' or datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} {% if balancer_name is defined %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf index 12e8781fbf..c96efbc83a 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf @@ -1,4 +1,4 @@ -{% if datacenter == 'iad2' or datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf index c0d822d36d..29eb701edf 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf @@ -17,9 +17,9 @@ RewriteCond %{SERVER_NAME} !^registry-no-cdn\.fedoraproject\.org$ # We don't want some methods to go to the cdn so we can update it RewriteCond %{REQUEST_METHOD} !^(PATCH|POST|PUT|DELETE|HEAD)$ # builders shouldn't use the cdn for flatpak building. -RewriteCond expr "! -R '10.3.169.0/24'" -RewriteCond expr "! -R '10.3.170.0/24'" -RewriteCond expr "! -R '10.3.171.0/24'" +RewriteCond expr "! -R '10.16.169.0/24'" +RewriteCond expr "! -R '10.16.170.0/24'" +RewriteCond expr "! -R '10.16.171.0/24'" RewriteRule ^/v2/(.*)/blobs/([a-zA-Z0-9:]*) https://cdn.registry.fedoraproject.org/v2/$1/blobs/$2 [R] {% endif %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf index 3565012c15..78e196d9dc 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf @@ -1 +1 @@ -{% include "reversepassproxy.conf-nonopenshift-iad2" %} +{% include "reversepassproxy.conf-nonopenshift-rdu3" %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf index 3565012c15..78e196d9dc 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf @@ -1 +1 @@ -{% include "reversepassproxy.conf-nonopenshift-iad2" %} +{% include "reversepassproxy.conf-nonopenshift-rdu3" %} diff --git a/roles/ipa/client/tasks/vpn.yml b/roles/ipa/client/tasks/vpn.yml index 6293618a81..57a312c2b5 100644 --- a/roles/ipa/client/tasks/vpn.yml +++ b/roles/ipa/client/tasks/vpn.yml @@ -1,6 +1,6 @@ --- - name: Install /etc/hosts for VPN clients - when: "(vpn | default(false)) and (datacenter | default('iad2')) != 'iad2'" + when: "(vpn | default(false)) and (datacenter | default('rdu3')) != 'rdu3'" include_role: name: hosts apply: diff --git a/roles/iscsi_client/files/multipath.conf b/roles/iscsi_client/files/multipath.conf deleted file mode 100644 index 48230156e2..0000000000 --- a/roles/iscsi_client/files/multipath.conf +++ /dev/null @@ -1,69 +0,0 @@ -defaults { - rr_min_io 128 - user_friendly_names yes - max_fds max - queue_without_daemon no - polling_interval 3 -} - -blacklist { - devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" - devnode "^hd[a-z]" - devnode "^cciss!c[0-9]d[0-9]*" - device { - vendor "IBM-ESXS" - } - device { - vendor "IBM" - } - device { - vendor "LSILOGIC" - } - device { - vendor "ATA" - } - device { - vendor "VMware" - } - device { - vendor "DELL" - } - device { - vendor "WD" - } - -} - -devices { -# device { -# vendor "NETAPP" -# product "LUN" -# path_grouping_policy group_by_prio -# path_checker directio -# failback immediate -# prio ontap -# features "no_path_retry queue" -# } - - device { - path_checker tur - product "NEXTRA" - vendor "XIV" - rr_min_io 15 - path_grouping_policy multibus - path_selector "round-robin 0" - no_path_retry 5 - failback 15 - } - - device { - path_checker tur - product "2810XIV" - vendor "IBM" - rr_min_io 15 - path_grouping_policy multibus - path_selector "round-robin 0" - no_path_retry 5 - failback 15 - } -} diff --git a/roles/iscsi_client/tasks/main.yml b/roles/iscsi_client/tasks/main.yml deleted file mode 100644 index 3208740b85..0000000000 --- a/roles/iscsi_client/tasks/main.yml +++ /dev/null @@ -1,77 +0,0 @@ ---- -# -# This task sets up iscsid and mpathd on a machine. -# -# -- name: Install packages needed for iscsi_client (yum) - ansible.builtin.package: - state: present - name: - - iscsi-initiator-utils - - device-mapper-multipath - tags: - - packages - when: ansible_distribution_major_version|int < 8 and ansible_distribution == "RedHat" - -- name: Install packages needed for iscsi_client (dnf) - ansible.builtin.package: - state: present - name: - - iscsi-initiator-utils - - device-mapper-multipath - tags: - - packages - when: ansible_distribution_major_version|int >= 29 and ansible_distribution == "Fedora" and ansible_cmdline.ostree is not defined - -- name: Install packages needed for iscsi_client (dnf) - ansible.builtin.package: - state: present - name: - - iscsi-initiator-utils - - device-mapper-multipath - tags: - - packages - when: ansible_distribution_major_version|int >= 8 and ansible_distribution == "RedHat" and ansible_cmdline.ostree is not defined - -- name: Enable iscsi service - service: state=started enabled=yes name=iscsi - tags: - - services - -- name: Enable multipathd service - service: state=started enabled=yes name=multipathd - tags: - - services - -- name: Setup multipath.conf file - ansible.builtin.copy: src=multipath.conf dest=/etc/multipath.conf - tags: - - config - -- name: Setup initiatorname.iscsi - ansible.builtin.template: src=initiatorname.iscsi.j2 dest=/etc/iscsi/initiatorname.iscsi - tags: - - config - -- name: Set up iscsi interface for EL8 - ansible.builtin.command: creates=/var/lib/iscsi/ifaces/{{ netapp_iscsi_interface_iad2 }} iscsiadm -m iface -I {{ netapp_iscsi_interface_iad2 }} --op=new - when: ansible_distribution_major_version|int >= 8 and ansible_distribution == "RedHat" and datacenter == 'iad2' - tags: - - config - -- name: Run iscsiadm command for initial connect to PHX2 vtap-fedora-iscsi01 - ansible.builtin.command: creates=/var/lib/iscsi/nodes/{{ netapp_iscsi_name }}/{{ netapp_iscsi_portal }},3260 /sbin/iscsiadm --mode node --targetname --portal {{ netapp_iscsi_portal }} -o new ; /sbin/iscsiadm --mode node --targetname {{ netapp_iscsi_name }} --portal {{ netapp_iscsi_portal }} --login - tags: - - config - -- name: Run iscsiadm command for initial connect to IAD2 vtap-fedora-iscsi01 - ansible.builtin.command: creates=/var/lib/iscsi/nodes/{{ netapp_iscsi_name_iad2 }}/{{ netapp_iscsi_portal_iad2 }},3260 /sbin/iscsiadm --mode node --targetname --portal {{ netapp_iscsi_portal_iad2 }} -o new ; /sbin/iscsiadm --mode node --targetname {{ netapp_iscsi_name_iad2 }} --portal {{ netapp_iscsi_portal_iad2 }} --login - when: ansible_distribution_major_version|int >= 8 and ansible_distribution == "RedHat" and datacenter == 'iad2' - tags: - - config - -# - name: Run iscsiadm command for initial connect to vtap-fedora-nfs01 -# ansible.builtin.command: creates=/var/lib/iscsi/nodes/{{ netapp_nfs01_iscsi_name }}/{{ netapp_nfs01_iscsi_portal }},3260 /sbin/iscsiadm --mode node --targetname --portal {{ netapp_nfs01_iscsi_portal }} -o new ; /sbin/iscsiadm --mode node --targetname {{ netapp_nfs01_iscsi_name }} --portal {{ netapp_nfs01_iscsi_portal }} --login -# tags: -# - config -# when: inventory_hostname_short == "buildvmhost-10" diff --git a/roles/iscsi_client/templates/initiatorname.iscsi.j2 b/roles/iscsi_client/templates/initiatorname.iscsi.j2 deleted file mode 100644 index 0555966823..0000000000 --- a/roles/iscsi_client/templates/initiatorname.iscsi.j2 +++ /dev/null @@ -1 +0,0 @@ -InitiatorName=iqn.2003-11.org.fedoraproject.{{ inventory_hostname }} diff --git a/roles/iscsi_client/vars/main.yml b/roles/iscsi_client/vars/main.yml deleted file mode 100644 index 38d317b2f3..0000000000 --- a/roles/iscsi_client/vars/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# iscsi initiator for netapp iscsi volume -netapp_iscsi_name: iqn.1992-08.com.netapp:sn.8a2c2d9073de11e4a645123478563412:vs.13 -# iscsi portal for netapp iscsi volume -netapp_iscsi_portal: 10.5.88.56 - -# iscsi initiator for netapp iscsi volume -netapp_iscsi_name_iad2: iqn.1992-08.com.netapp:sn.cd436d978abd11eaba39d039ea14e9fa:vs.5 -# iscsi portal for netapp iscsi volume -netapp_iscsi_portal_iad2: 10.3.177.12 -# iscsi interface for iad2 -netapp_iscsi_interface_iad2: br0 diff --git a/roles/kerneltest/templates/kerneltest.cfg b/roles/kerneltest/templates/kerneltest.cfg index bbae7d4a6c..ad44b1ac40 100644 --- a/roles/kerneltest/templates/kerneltest.cfg +++ b/roles/kerneltest/templates/kerneltest.cfg @@ -6,7 +6,7 @@ SECRET_KEY='{{ kerneltest_secret_key }}' ### url to the database server: #DB_URL=mysql://user:pass@host/db_name #DB_URL=postgres://user:pass@host/db_name -DB_URL='postgresql://{{ kerneltest_db_user }}:{{ kerneltest_db_pass }}@db01.iad2.fedoraproject.org/{{ kerneltest_db_name }}' +DB_URL='postgresql://{{ kerneltest_db_user }}:{{ kerneltest_db_pass }}@db01.rdu3.fedoraproject.org/{{ kerneltest_db_name }}' # Specify where the logs of the tests should be stored LOG_DIR = '/var/www/logs' diff --git a/roles/kickstarts/templates/hardware-fedora-06disk-nvme.j2 b/roles/kickstarts/templates/hardware-fedora-06disk-nvme.j2 index 3fce3d6c86..405f37b39e 100644 --- a/roles/kickstarts/templates/hardware-fedora-06disk-nvme.j2 +++ b/roles/kickstarts/templates/hardware-fedora-06disk-nvme.j2 @@ -5,7 +5,7 @@ # Use network installation vnc --password "{{ kickstart_vnc_password }}" # Use network install -# metalink here should give internal mirrors in iad2 and external ones outside +# metalink here should give internal mirrors in rdu3 and external ones outside url --metalink "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch" repo --name=updates --metalink "https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch" diff --git a/roles/kickstarts/templates/hardware-fedora-06disk.j2 b/roles/kickstarts/templates/hardware-fedora-06disk.j2 index df50fe042b..680235a99a 100644 --- a/roles/kickstarts/templates/hardware-fedora-06disk.j2 +++ b/roles/kickstarts/templates/hardware-fedora-06disk.j2 @@ -5,7 +5,7 @@ # Use network installation vnc --password "{{ kickstart_vnc_password }}" # Use network install -# metalink here should give internal mirrors in iad2 and external ones outside +# metalink here should give internal mirrors in rdu3 and external ones outside url --metalink "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch" repo --name=updates --metalink "https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch" diff --git a/roles/kickstarts/templates/openqa-fedora-08disk.j2 b/roles/kickstarts/templates/openqa-fedora-08disk.j2 index 03413ce1ff..f7a43fea65 100644 --- a/roles/kickstarts/templates/openqa-fedora-08disk.j2 +++ b/roles/kickstarts/templates/openqa-fedora-08disk.j2 @@ -6,7 +6,7 @@ text # Use network installation -# metalink here should give internal mirrors in iad2 and external ones outside +# metalink here should give internal mirrors in rdu3 and external ones outside url --metalink "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch" repo --name=updates --metalink "https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch" @@ -99,7 +99,7 @@ xz %end %post --nochroot --log=/mnt/sysimage/root/post.output --erroronfail -/mnt/sysimage/usr/sbin/ip addr | grep 10.3.1 && echo '10.3.163.35 infrastructure.fedoraproject.org' >> /mnt/sysimage/etc/hosts +/mnt/sysimage/usr/sbin/ip addr | grep 10.16.1 && echo '10.16.163.35 infrastructure.fedoraproject.org' >> /mnt/sysimage/etc/hosts cat /mnt/sysimage/etc/hosts mkdir /mnt/sysimage/root/tmp chroot /mnt/sysimage /usr/bin/curl https://infrastructure.fedoraproject.org/rhel/ks/post/fedora-post.sh -o /root/tmp/fedora-post.sh diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 978a5731dc..17be33ea06 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -85,7 +85,7 @@ allowed_scms_use_policy = true build_arch_can_fail = true ; The mail host to use for sending email notifications -smtphost=bastion.iad2.fedoraproject.org +smtphost=bastion.rdu3.fedoraproject.org ; The From address used when sending email notifications from_addr=Fedora Koji Build System diff --git a/roles/koji_hub/templates/koji-gc.conf.j2 b/roles/koji_hub/templates/koji-gc.conf.j2 index 74e22e2a83..5abcd3cd37 100644 --- a/roles/koji_hub/templates/koji-gc.conf.j2 +++ b/roles/koji_hub/templates/koji-gc.conf.j2 @@ -14,7 +14,7 @@ principal=koji-gc/koji{{env_suffix}}.fedoraproject.org@{{ipa_realm}} keytab=/etc/krb5.koji-gc_koji{{env_suffix}}.fedoraproject.org.keytab {% endif %} krb_rdns = False -smtp_host = bastion.iad2.fedoraproject.org +smtp_host = bastion.rdu3.fedoraproject.org key_aliases = 30C9ECF8 fedora-test diff --git a/roles/kojipkgs/templates/kojipkgs.conf b/roles/kojipkgs/templates/kojipkgs.conf index bef16bbc74..9a7f8fe03a 100644 --- a/roles/kojipkgs/templates/kojipkgs.conf +++ b/roles/kojipkgs/templates/kojipkgs.conf @@ -187,9 +187,9 @@ Alias /pub /pub Require all granted -# This IP is sign-bridge01.iad2.fedoraproject.org. +# This IP is sign-bridge01.rdu3.fedoraproject.org. # It needs to be able to sign openh264 packages. -RewriteCond %{HTTP:X-Forwarded-For} !10.3.169.120 +RewriteCond %{HTTP:X-Forwarded-For} !10.16.169.120 RewriteRule ".*/(openh264|mozilla-openh264).*.(x86_64|armv7hl|i686|ppc64|ppc64le|aarch64|s390x).rpm$" "https://fedoraproject.org/wiki/non-distributable-rpms" [R=302,L] # Set HSTS header via HTTP since it cannot be easily set in squid, which terminates HTTPS diff --git a/roles/mariadb_server/files/my.cnf.db-qa01.iad2.fedoraproject.org b/roles/mariadb_server/files/my.cnf.db-qa01.iad2.fedoraproject.org deleted file mode 100644 index fd9d75a333..0000000000 --- a/roles/mariadb_server/files/my.cnf.db-qa01.iad2.fedoraproject.org +++ /dev/null @@ -1,156 +0,0 @@ -# Example MariaDB config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MariaDB plays -# an important part, or systems up to 128M where MariaDB is used together with -# other programs (such as a web server) -# -# MariaDB programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, do: -# 'my_print_defaults --help' and see what is printed under -# Default options are read from the following files in the given order: -# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MariaDB clients -[client] -#password = your_password -port = 3306 -socket = /var/lib/mysql/mysql.sock - -# Here follows entries for some specific programs - -# The MariaDB server -[mysqld] -port = 3306 -socket = /var/lib/mysql/mysql.sock -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# setting STRICT_ALL_TABLES for phabricator -sql_mode=STRICT_ALL_TABLES - -# Point the following paths to different dedicated disks -#tmpdir = /tmp/ - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -#skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, -# MASTER_USER=, MASTER_PASSWORD= ; -# -# where you replace , , by quoted strings and -# by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -innodb_data_home_dir = /var/lib/mysql -innodb_data_file_path = ibdata1:10M:autoextend -innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -innodb_buffer_pool_size = 1600M -innodb_additional_mem_pool_size = 200M -# Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 400M -innodb_log_buffer_size = 800M -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 50 - -# added as per reccommended by phab setup -ft_stopword_file=/usr/share/phabricator/resources/sql/stopwords.txt -ft_min_word_len=3 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 182391052b..ce02a802f0 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -343,12 +343,12 @@ $wgSquidServersNoPurge = array( "::1", {% if env == "staging" %} # proxy01.stg - "38.145.60.32", + "38.145.32.32", # proxy10.stg - "38.145.60.34", + "38.145.32.34", {% else %} # proxy01 - "10.3.163.74", + "10.16.163.74", "192.168.1.11", # proxy02 @@ -380,7 +380,7 @@ $wgSquidServersNoPurge = array( "192.168.1.15", # proxy10 - "10.3.163.75", + "10.16.163.75", "192.168.1.17", # proxy11 @@ -456,12 +456,12 @@ $wgSquidServersNoPurge = array( $wgSquidServers = array( {% if env == "staging" %} # proxy01.stg - "10.3.166.74:6081", + "10.16.166.74:6081", # proxy10.stg - "10.3.166.74:6081", + "10.16.166.74:6081", {% else %} # proxy01 - "10.3.163.74:6081", + "10.16.163.74:6081", # proxy02 "192.168.1.12:6081", # proxy03 @@ -475,7 +475,7 @@ $wgSquidServers = array( # proxy09 "192.168.1.15:6081", # proxy10 - "10.3.163.75:6081", + "10.16.163.75:6081", # proxy11 "192.168.1.37:6081", # proxy12 diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index 03526c3982..efe5b9fbc2 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -240,7 +240,7 @@ - nagios_client - name: Install CRL check for bastions - when: inventory_hostname.startswith('bastion') and datacenter == 'iad2' + when: inventory_hostname.startswith('bastion') and datacenter == 'rdu3' tags: - nagios_client block: diff --git a/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2 index b68a41adca..110e865bef 100644 --- a/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2 +++ b/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2 @@ -1 +1 @@ -command[check_rabbitmq_cluster]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_cluster --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini -n rabbit@rabbitmq01.iad2.fedoraproject.org,rabbit@rabbitmq02.iad2.fedoraproject.org,rabbit@rabbitmq03.iad2.fedoraproject.org +command[check_rabbitmq_cluster]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_cluster --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini -n rabbit@rabbitmq01.rdu3.fedoraproject.org,rabbit@rabbitmq02.rdu3.fedoraproject.org,rabbit@rabbitmq03.rdu3.fedoraproject.org diff --git a/roles/nagios_client/templates/nrpe.cfg.j2 b/roles/nagios_client/templates/nrpe.cfg.j2 index aff0465b0a..6b8f4e5ef9 100644 --- a/roles/nagios_client/templates/nrpe.cfg.j2 +++ b/roles/nagios_client/templates/nrpe.cfg.j2 @@ -80,9 +80,9 @@ nrpe_group=nrpe {% if env == "staging" %} -allowed_hosts=10.3.163.10,192.168.1.10,192.168.1.20,38.145.60.15,192.168.1.166,38.145.60.16,192.168.0.66,38.145.32.15,10.16.163.10 +allowed_hosts=192.168.1.10,192.168.1.20,192.168.1.166,38.145.32.16,192.168.0.66,38.145.32.15,10.16.163.10 {% else %} -allowed_hosts=10.3.163.10,192.168.1.10,192.168.1.20,38.145.60.15,192.168.1.166,38.145.60.16,192.168.0.66,38.145.32.15,10.16.163.10 +allowed_hosts=192.168.1.10,192.168.1.20,192.168.1.166,38.145.32.16,192.168.0.66,38.145.32.15,10.16.163.10 {% endif %} diff --git a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg index b974a98933..44106c472a 100644 --- a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg @@ -9,9 +9,9 @@ define servicedependency { } define servicedependency { - host_name 38.145.60.20-iad2 + host_name 38.145.32.20-rdu3 service_description https - dependent_host_name 38.145.60.20-iad2 + dependent_host_name 38.145.32.20-rdu3 dependent_service_description bodhi, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, fedoraproject.org, fedoraproject.org - wiki notification_failure_criteria w,c execution_failure_criteria w,c diff --git a/roles/nagios_server/files/nagios/servicegroups/iad2-mgmt-http.cfg b/roles/nagios_server/files/nagios/servicegroups/rdu3-mgmt-http.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/iad2-mgmt-http.cfg rename to roles/nagios_server/files/nagios/servicegroups/rdu3-mgmt-http.cfg diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/basset.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/basset.cfg deleted file mode 100644 index 9028cceed1..0000000000 --- a/roles/nagios_server/files/nagios/services/iad2_internal/basset.cfg +++ /dev/null @@ -1,28 +0,0 @@ -# TODO: uncomment after moving to iad2 -#define service { -# hostgroup_name basset -# service_description mongo process -# check_command check_by_nrpe!check_mongo_proc -# use defaulttemplate -#} -# -#define service { -# hostgroup_name basset -# service_description rabbitmq process -# check_command check_by_nrpe!check_rabbitmq_proc -# use defaulttemplate -#} -# -#define service { -# hostgroup_name basset -# service_description basset worker processes -# check_command check_by_nrpe!check_worker_proc -# use defaulttemplate -#} -# -#define service { -# hostgroup_name basset -# service_description basset processing queue -# check_command check_by_nrpe!check_basset_queue -# use defaulttemplate -#} diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/certgetter.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/certgetter.cfg deleted file mode 100644 index d258b3ec76..0000000000 --- a/roles/nagios_server/files/nagios/services/iad2_internal/certgetter.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define service { - host_name certgetter01.iad2.fedoraproject.org - service_description certgetter-http - check_command check_http!certgetter01.iad2.fedoraproject.org - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg new file mode 100644 index 0000000000..ba0bc9ff28 --- /dev/null +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg @@ -0,0 +1,27 @@ +define service { + hostgroup_name basset + service_description mongo process + check_command check_by_nrpe!check_mongo_proc + use defaulttemplate +} + +define service { + hostgroup_name basset + service_description rabbitmq process + check_command check_by_nrpe!check_rabbitmq_proc + use defaulttemplate +} + +define service { + hostgroup_name basset + service_description basset worker processes + check_command check_by_nrpe!check_worker_proc + use defaulttemplate +} + +define service { + hostgroup_name basset + service_description basset processing queue + check_command check_by_nrpe!check_basset_queue + use defaulttemplate +} diff --git a/roles/nagios_server/files/nagios/services/rdu3_internal/certgetter.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/certgetter.cfg new file mode 100644 index 0000000000..13bdc2e38e --- /dev/null +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/certgetter.cfg @@ -0,0 +1,6 @@ +define service { + host_name certgetter01.rdu3.fedoraproject.org + service_description certgetter-http + check_command check_http!certgetter01.rdu3.fedoraproject.org + use defaulttemplate +} diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/db_backups.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/db_backups.cfg similarity index 79% rename from roles/nagios_server/files/nagios/services/iad2_internal/db_backups.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/db_backups.cfg index 1685af994a..cd42d2a343 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/db_backups.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/db_backups.cfg @@ -1,5 +1,5 @@ define service { - host_name db03.iad2.fedoraproject.org + host_name db03.rdu3.fedoraproject.org service_description Check MySQL Backup check_command check_by_nrpe!check_mysql_backup use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/disk.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/disk.cfg similarity index 77% rename from roles/nagios_server/files/nagios/services/iad2_internal/disk.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/disk.cfg index e1a666ba7c..01d81443bd 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/disk.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/disk.cfg @@ -21,7 +21,7 @@ define service { #} define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Disk space /var/log check_command check_by_nrpe!check_disk_/var/log use disktemplate @@ -48,20 +48,19 @@ define service { use ppc-secondarytemplate } -# TODO: Uncomment this and the one below when retrace is back in iad2 -#define service { -# hostgroup_name retrace -# service_description Disk space / -# check_command check_by_nrpe!check_disk_/ -# use retracetemplate -#} +define service { + hostgroup_name retrace + service_description Disk space / + check_command check_by_nrpe!check_disk_/ + use retracetemplate +} -#define service { -# hostgroup_name retrace -# service_description Disk Space for huge /srv -# check_command check_by_nrpe!check_disk_huge_/srv -# use disktemplate -#} +define service { + hostgroup_name retrace + service_description Disk Space for huge /srv + check_command check_by_nrpe!check_disk_huge_/srv + use disktemplate +} define service { hostgroup_name people diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/fedora_messaging.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/fedora_messaging.cfg similarity index 78% rename from roles/nagios_server/files/nagios/services/iad2_internal/fedora_messaging.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/fedora_messaging.cfg index ac7dbb187e..2d3d70afeb 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/fedora_messaging.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/fedora_messaging.cfg @@ -1,91 +1,91 @@ # BEGIN, check datanommer history define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent buildsys/koji messages check_command check_by_nrpe!check_datanommer_buildsys use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent git messages check_command check_by_nrpe!check_datanommer_git use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent bodhi compose messages check_command check_by_nrpe!check_datanommer_bodhi_composes use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent bodhi messages check_command check_by_nrpe!check_datanommer_bodhi use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent wiki messages check_command check_by_nrpe!check_datanommer_wiki use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent compose messages check_command check_by_nrpe!check_datanommer_compose use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent meetbot messages check_command check_by_nrpe!check_datanommer_meetbot use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent fedoraplanet messages check_command check_by_nrpe!check_datanommer_planet use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent copr finished build messages check_command check_by_nrpe!check_datanommer_copr use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent badges messages check_command check_by_nrpe!check_datanommer_badges use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent fedocal messages check_command check_by_nrpe!check_datanommer_fedocal use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent ansible messages check_command check_by_nrpe!check_datanommer_ansible use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent hotness messages check_command check_by_nrpe!check_datanommer_hotness use defaulttemplate @@ -94,7 +94,7 @@ define service { define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent mailman messages check_command check_by_nrpe!check_datanommer_mailman use defaulttemplate @@ -103,7 +103,7 @@ define service { define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent bugzilla messages check_command check_by_nrpe!check_datanommer_bugzilla use defaulttemplate @@ -112,42 +112,42 @@ define service { define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent github messages check_command check_by_nrpe!check_datanommer_github use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent kerneltest messages check_command check_by_nrpe!check_datanommer_kerneltest use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent fmn messages check_command check_by_nrpe!check_datanommer_fmn use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent rpm sign messages check_command check_by_nrpe!check_datanommer_rpmsign use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent mdapi messages check_command check_by_nrpe!check_datanommer_mdapi use defaulttemplate } define service { - host_name noc01.iad2.fedoraproject.org + host_name noc01.rdu3.fedoraproject.org service_description Check datanommer for recent resultsdb messages check_command check_by_nrpe!check_datanommer_resultsdb use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/file_age.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/file_age.cfg similarity index 87% rename from roles/nagios_server/files/nagios/services/iad2_internal/file_age.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/file_age.cfg index 4f6ea5f137..720d017f9e 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/file_age.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/file_age.cfg @@ -35,7 +35,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check Merged Log check_command check_by_nrpe!check_merged_file_age use defaulttemplate @@ -46,7 +46,7 @@ define service { # Fedora Countme: define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check Fedora countme raw DB age check_command check_by_nrpe!check_countme_fedora_raw use defaulttemplate @@ -55,7 +55,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check Fedora countme totals DB age check_command check_by_nrpe!check_countme_fedora_tot use defaulttemplate @@ -64,7 +64,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check Fedora countme web DB1 age check_command check_by_nrpe!check_countme_fedora_web1 use defaulttemplate @@ -73,7 +73,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check Fedora countme web DB2 age check_command check_by_nrpe!check_countme_fedora_web2 use defaulttemplate @@ -82,7 +82,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check Fedora countme web DB3 age check_command check_by_nrpe!check_countme_fedora_web3 use defaulttemplate @@ -92,7 +92,7 @@ define service { # CentOS countme define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check CentOS countme raw DB age check_command check_by_nrpe!check_countme_centos_raw use defaulttemplate @@ -101,7 +101,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check CentOS countme totals DB age check_command check_by_nrpe!check_countme_centos_tot use defaulttemplate @@ -110,7 +110,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check CentOS countme web DB1 age check_command check_by_nrpe!check_countme_centos_web1 use defaulttemplate @@ -119,7 +119,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check CentOS countme web DB2 age check_command check_by_nrpe!check_countme_centos_web2 use defaulttemplate @@ -128,7 +128,7 @@ define service { } define service { - host_name log01.iad2.fedoraproject.org + host_name log01.rdu3.fedoraproject.org service_description Check CentOS countme web DB3 age check_command check_by_nrpe!check_countme_centos_web3 use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/koji.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/koji.cfg similarity index 80% rename from roles/nagios_server/files/nagios/services/iad2_internal/koji.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/koji.cfg index 3ed70cfdff..93c4fbb40d 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/koji.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/koji.cfg @@ -1,5 +1,5 @@ define service { - host_name koji01.iad2.fedoraproject.org + host_name koji01.rdu3.fedoraproject.org service_description Check Koji check_command check_koji max_check_attempts 5 @@ -8,7 +8,7 @@ define service { define service { - host_name koji01.iad2.fedoraproject.org + host_name koji01.rdu3.fedoraproject.org service_description Check Koji wellness check_command check_koji_wellness.py!koji.fedoraproject.org!koji max_check_attempts 5 diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/locking.cfg similarity index 74% rename from roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/locking.cfg index 6a3cf6cd4d..725cfc6a73 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/locking.cfg @@ -1,5 +1,5 @@ define service { - host_name koji01.iad2.fedoraproject.org + host_name koji01.rdu3.fedoraproject.org service_description Check NFS File Locks check_command check_by_nrpe!check_lock use criticaltemplate diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/mailman.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/mailman.cfg similarity index 76% rename from roles/nagios_server/files/nagios/services/iad2_internal/mailman.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/mailman.cfg index 97adc9f3b3..94df83107b 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/mailman.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/mailman.cfg @@ -1,5 +1,5 @@ define service { - host_name mailman01.iad2.fedoraproject.org + host_name mailman01.rdu3.fedoraproject.org service_description check mailman api check_command check_by_nrpe!check_mailman_api max_check_attempts 5 diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/nrpe.cfg similarity index 56% rename from roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/nrpe.cfg index 55e38a0dfa..989806f282 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/nrpe.cfg @@ -1,5 +1,5 @@ define service { - host_name bastion01.iad2.fedoraproject.org, sundries01.iad2.fedoraproject.org, wiki01.iad2.fedoraproject.org + host_name bastion01.rdu3.fedoraproject.org, sundries01.rdu3.fedoraproject.org, wiki01.rdu3.fedoraproject.org service_description nrpe check_command test_nrpe max_check_attempts 2 diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/pgsql.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/pgsql.cfg similarity index 72% rename from roles/nagios_server/files/nagios/services/iad2_internal/pgsql.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/pgsql.cfg index 5e8e40d545..0ea186d0e8 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/pgsql.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/pgsql.cfg @@ -1,12 +1,12 @@ define service { - host_name db-koji01.iad2.fedoraproject.org + host_name db-koji01.rdu3.fedoraproject.org service_description Check Koji DB check_command check_pgsql!koji use criticaltemplate } define service { - host_name db-fas01.iad2.fedoraproject.org + host_name db-fas01.rdu3.fedoraproject.org service_description Check FAS DB check_command check_pgsql!fas2 use criticaltemplate diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/rabbitmq.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/rabbitmq.cfg similarity index 76% rename from roles/nagios_server/files/nagios/services/iad2_internal/rabbitmq.cfg rename to roles/nagios_server/files/nagios/services/rdu3_internal/rabbitmq.cfg index c458b3955d..378a6f0d53 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/rabbitmq.cfg +++ b/roles/nagios_server/files/nagios/services/rdu3_internal/rabbitmq.cfg @@ -1,21 +1,21 @@ # RabbitMQ processes (for each host) define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus server processes check_command check_by_nrpe!check_rabbitmq_server use defaulttemplate } define service { - host_name rabbitmq02.iad2.fedoraproject.org + host_name rabbitmq02.rdu3.fedoraproject.org service_description Check bus server processes check_command check_by_nrpe!check_rabbitmq_server use defaulttemplate } define service { - host_name rabbitmq03.iad2.fedoraproject.org + host_name rabbitmq03.rdu3.fedoraproject.org service_description Check bus server processes check_command check_by_nrpe!check_rabbitmq_server use defaulttemplate @@ -24,21 +24,21 @@ define service { # RabbitMQ alarms (for each host) define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus server alarms check_command check_by_nrpe!check_rabbitmq_watermark use defaulttemplate } define service { - host_name rabbitmq02.iad2.fedoraproject.org + host_name rabbitmq02.rdu3.fedoraproject.org service_description Check bus server alarms check_command check_by_nrpe!check_rabbitmq_watermark use defaulttemplate } define service { - host_name rabbitmq03.iad2.fedoraproject.org + host_name rabbitmq03.rdu3.fedoraproject.org service_description Check bus server alarms check_command check_by_nrpe!check_rabbitmq_watermark use defaulttemplate @@ -47,50 +47,50 @@ define service { # The following results are cluster-wide, no need to run them on each cluster member define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus cluster check_command check_by_nrpe!check_rabbitmq_cluster use defaulttemplate } define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus cluster connections check_command check_by_nrpe!check_rabbitmq_connections use defaulttemplate } define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus cluster overview check_command check_by_nrpe!check_rabbitmq_overview use defaulttemplate } define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus exchanges in /pubsub check_command check_by_nrpe!check_rabbitmq_exchange_pubsub use defaulttemplate } define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus exchanges in /public_pubsub check_command check_by_nrpe!check_rabbitmq_exchange_public_pubsub use defaulttemplate } define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus queues in /pubsub check_command check_by_nrpe!check_rabbitmq_queue_pubsub use defaulttemplate } define service { - host_name rabbitmq01.iad2.fedoraproject.org + host_name rabbitmq01.rdu3.fedoraproject.org service_description Check bus queues in /public_pubsub check_command check_by_nrpe!check_rabbitmq_queue_public_pubsub use defaulttemplate -} \ No newline at end of file +} diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index c1cf2fc9a6..9028c0632e 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -180,8 +180,8 @@ notify: Restart nagios ## Copy over the services -- name: Copy /etc/nagios/services (IAD2 specific files) - ansible.builtin.copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }} +- name: Copy /etc/nagios/services (RDU3 specific files) + ansible.builtin.copy: src=nagios/services/rdu3_internal/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - basset.cfg - certgetter.cfg @@ -198,11 +198,11 @@ - nagios_config - nagios_server - nagios_hostgroups - when: env == "production" and nagios_location == 'iad2_internal' + when: env == "production" and nagios_location == 'rdu3_internal' notify: Restart nagios -- name: Copy /etc/nagios/services (IAD2 specific files) - ansible.builtin.copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }} +- name: Copy /etc/nagios/services (RDU3 specific files) + ansible.builtin.copy: src=nagios/services/rdu3_internal/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - basset.cfg - certgetter.cfg @@ -220,7 +220,7 @@ - nagios_config - nagios_server - nagios_hostgroups - when: env == "production" and nagios_location == 'iad2_internal' + when: env == "production" and nagios_location == 'rdu3_internal' notify: Restart nagios - name: Copy /etc/nagios/services (internal files) @@ -246,7 +246,7 @@ - nagios_config - nagios_server - nagios_hostgroups - when: nagios_location == 'iad2_internal' or nagios_location == 'rdu3_internal' + when: nagios_location == 'rdu3_internal' or nagios_location == 'rdu3_internal' notify: Restart nagios ## Copy over the services @@ -280,7 +280,7 @@ tags: - nagios_config - nagios_server - when: nagios_location == 'iad2_internal' or nagios_location == 'rdu3_internal' + when: nagios_location == 'rdu3_internal' or nagios_location == 'rdu3_internal' notify: Restart nagios ## Copy over the servicegroups @@ -390,7 +390,7 @@ with_items: - ipa.cfg - mirrorlist-proxies.cfg - when: env == "production" and nagios_location == 'iad2_internal' + when: env == "production" and nagios_location == 'rdu3_internal' tags: - nagios_server - nagios_config @@ -420,7 +420,7 @@ - other.cfg - rdu-cc-hosts.cfg - rdu-hosts.cfg - - iad2-external.cfg + - rdu3-external.cfg - aws-hosts.cfg when: env == "production" tags: @@ -433,10 +433,10 @@ - name: Build out nagios host templates (production) ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root with_items: - - iad2-hosts.cfg - - iad2-mgmt-hosts.cfg + - rdu3-hosts.cfg + - rdu3-mgmt-hosts.cfg - staging-hosts.cfg - when: env == "production" and nagios_location == 'iad2_internal' + when: env == "production" and nagios_location == 'rdu3_internal' tags: - nagios_server - nagios_config @@ -467,8 +467,8 @@ - name: Build out nagios host templates (production) ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root with_items: - - iad2-hosts.cfg - when: env == "production" and nagios_location == 'iad2_internal' + - rdu3-hosts.cfg + when: env == "production" and nagios_location == 'rdu3_internal' tags: - nagios_server - nagios_config @@ -490,7 +490,7 @@ - name: Build out nagios host templates (production) ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root with_items: - - iad2-external.cfg + - rdu3-external.cfg - ibiblio-hosts-ipv6.cfg when: env == "production" and nagios_location == "external" tags: @@ -507,7 +507,7 @@ - checkswap.cfg - checkraid.cfg - other.cfg - when: nagios_location == 'iad2_internal' or nagios_location == 'rdu3_internal' + when: nagios_location == 'rdu3_internal' or nagios_location == 'rdu3_internal' tags: - nagios_server - nagios_config @@ -528,8 +528,8 @@ - name: Build out nagios services templates ansible.builtin.template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root with_items: - - iad2-mgmt.cfg - when: nagios_location == 'iad2_internal' + - rdu3-mgmt.cfg + when: nagios_location == 'rdu3_internal' tags: - nagios_server - nagios_config diff --git a/roles/nagios_server/templates/httpd/nagios.conf.j2 b/roles/nagios_server/templates/httpd/nagios.conf.j2 index df506cb42e..b4f6917925 100644 --- a/roles/nagios_server/templates/httpd/nagios.conf.j2 +++ b/roles/nagios_server/templates/httpd/nagios.conf.j2 @@ -42,7 +42,7 @@ Alias /robots.txt /var/www/robots.txt {% if vars['nagios_location'] == 'external' %} Require ip 2600:2701:4000:5211:dead:beef:00fe:fed9 {% else %} - Require ip 10.3.163.10 + Require ip 10.16.163.10 {% endif %} Require ip 127.0.0.1 Require ip ::1 diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2 deleted file mode 100644 index db3207eee2..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2 +++ /dev/null @@ -1,46 +0,0 @@ -############### -# All Servers and associated devices -############### -## {{ env }} -{% for key, value in groups.items()|sort %} -{% if groups[key] != [] and key not in vars['exclude_iad2_hostgroups'] %} -define hostgroup{ - hostgroup_name {{ key }} - alias {{ key }} - members {% for host in groups[key]|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %} - -} -{% endif %} -{% endfor %} - -define hostgroup{ - hostgroup_name no_ping - alias no_ping - members {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['ping'] == true or hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %} -} - -## Services with minimal monitoring - -define hostgroup{ - hostgroup_name cloud_aws_group - alias cloud_aws_group - members {% for host in groups['cloud_aws']|sort %}{{host}}, {% endfor %} -} - - -define hostgroup{ - hostgroup_name mincheckgrp - alias mincheckgrp - members {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['nrpe'] != true and hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %} - -} - -define hostgroup{ - hostgroup_name routers - alias routers - members ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, iad2-gw -} - - -## -## Management hardware diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2 index dd952704be..271e16c197 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2 @@ -35,5 +35,5 @@ define hostgroup{ define hostgroup{ hostgroup_name routers alias routers - members ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, iad2-gw, rdu3-gw -} \ No newline at end of file + members ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, rdu3-gw +} diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index e2c0e7fb62..6a3144fc19 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 @@ -3,7 +3,7 @@ ############### ## {{ env }} {% for key, value in groups.items()|sort %} -{% if groups[key] != [] and key not in vars['exclude_iad2_hostgroups'] %} +{% if groups[key] != [] and key not in vars['exclude_rdu3_hostgroups'] %} define hostgroup{ hostgroup_name {{ key }} alias {{ key }} @@ -40,7 +40,7 @@ define hostgroup{ define hostgroup{ hostgroup_name routers alias routers - members ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, iad2-gw + members ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, rdu3-gw } diff --git a/roles/nagios_server/templates/nagios/hostgroups/other.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/other.cfg.j2 index 79324e0665..7be0996b30 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/other.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/other.cfg.j2 @@ -1,15 +1,15 @@ -{% if datacenter == 'iad2' %} +{% if datacenter == 'rdu3' %} define hostgroup { hostgroup_name oneproxy alias just one proxy - members proxy01.iad2.fedoraproject.org + members proxy01.rdu3.fedoraproject.org } define hostgroup { hostgroup_name oneproxy-stg alias just one proxy in staging - members proxy01.stg.iad2.fedoraproject.org + members proxy01.stg.rdu3.fedoraproject.org } {% elif datacenter == 'rdu3' %} diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 index 69902be9f7..8b13f11bd6 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 @@ -6,4 +6,4 @@ define hostgroup { members {% for host in groups['all']|sort %}{% if ( hostvars[host].datacenter == datacenter ) and ( hostvars[host].vpn == true ) and ( hostvars[host].nagios_Can_Connect == true ) and (host not in groups['ocp_stg']+groups['ocp']) %}{{host}},{% endif %}{% endfor %} } -# TODO: Add !bastion02.iad2.fedoraproject.org above when it exists. +# TODO: Add !bastion02.rdu3.fedoraproject.org above when it exists. diff --git a/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2 index 8d719865cb..615bcc5d81 100644 --- a/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'bodhost' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2 index dfe0ff757f..2d543b0c1b 100644 --- a/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'dedicatedsolutions' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 index 512df71a3a..be2bd414e1 100644 --- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 @@ -9,32 +9,12 @@ define host { alias ibiblio gateway use mincheck check_command check-host-alive4 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% endif %} address 152.19.134.129 } -#'iad2' -define host { - host_name iad2-gw - alias iad2 cage gateway - use mincheck - check_command check-host-alive4 -{% if vars['nagios_location'] == 'iad2_internal' %} - address 10.3.163.254 -{% elif vars['nagios_location'] == 'rdu3_internal' %} - address 209.132.185.206 -{% elif vars['nagios_location'] == 'external' %} - address 209.132.185.206 - parents ibiblio-gw -{% endif %} - -} - - #Mark Note to Self: Come back and correct these later # 'rdu3' define host { @@ -42,9 +22,7 @@ define host { alias rdu3 gateway use mincheck check_command check-host-alive4 -{% if vars['nagios_location'] == 'iad2_internal' %} - address 209.132.181.204 -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} address 10.16.163.254 {% elif vars['nagios_location'] == 'external' %} address 209.132.181.204 @@ -60,9 +38,7 @@ define host { use mincheck check_command check-host-alive4 address 67.219.144.65 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% elif vars['nagios_location'] == 'external' %} parents ibiblio-gw @@ -77,9 +53,7 @@ define host { use mincheck check_command check-host-alive4 address 185.141.164.1 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% elif vars['nagios_location'] == 'external' %} parents ibiblio-gw @@ -94,9 +68,7 @@ define host { use mincheck check_command check-host-alive4 address 85.236.55.1 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% elif vars['nagios_location'] == 'external' %} parents ibiblio-gw @@ -111,9 +83,7 @@ define host { use mincheck check_command check-host-alive4 address 140.211.169.193 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% elif vars['nagios_location'] == 'external' %} parents ibiblio-gw @@ -128,9 +98,7 @@ define host { use mincheck check_command check-host-alive4 address 209.132.190.196 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% elif vars['nagios_location'] == 'external' %} parents ibiblio-gw @@ -145,9 +113,7 @@ define host { use mincheck check_command check-host-alive4 address 8.43.85.254 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'rdu3_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} parents rdu3-gw {% elif vars['nagios_location'] == 'external' %} parents ibiblio-gw diff --git a/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2 index a9aa14b10b..25144e67e4 100644 --- a/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'host1plus' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/iad2-external.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/iad2-external.cfg.j2 deleted file mode 100644 index 38d02046e6..0000000000 --- a/roles/nagios_server/templates/nagios/hosts/iad2-external.cfg.j2 +++ /dev/null @@ -1,9 +0,0 @@ -{% for host in vars["iad2_external"]|sort %} -define host { - host_name {{ host }} - alias {{ host }} - use mincheck - address {{ host }} - parents iad2-gw -} -{% endfor %} diff --git a/roles/nagios_server/templates/nagios/hosts/iad2-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/iad2-hosts.cfg.j2 deleted file mode 100644 index 83374a936f..0000000000 --- a/roles/nagios_server/templates/nagios/hosts/iad2-hosts.cfg.j2 +++ /dev/null @@ -1,32 +0,0 @@ -{% for host in groups['all']|sort %} -{% if hostvars[host].datacenter == 'iad2' and hostvars[host].nagios_Can_Connect == true %} -define host { -{% if hostvars[host].nagios_Check_Services['nrpe'] == true %} - use defaulttemplate -{% else %} - use mincheck -{% endif %} - host_name {{ host }} -{% if hostvars[host].ansible_hostname is defined %} - alias {{ hostvars[host].ansible_hostname }} -{% else %} - alias {{ host }} -{% endif %} -{% if hostvars[host].eth0_ipv4_ip is defined %} - address {{ hostvars[host].eth0_ipv4_ip }} -{% elif hostvars[host].ansible_default_ipv4 is defined %} -{% if hostvars[host].ansible_default_ipv4.address is defined %} - address {{ hostvars[host].ansible_default_ipv4.address }} -{% endif %} -{% else %} - address {{ host }} -{% endif %} -{% if hostvars[host]['vmhost'] is defined %} - parents {{ hostvars[host]['vmhost'] }} -{% elif hostvars[host].datacenter is defined %} - parents iad2-gw -{% endif %} -} - -{% endif %} -{% endfor %} diff --git a/roles/nagios_server/templates/nagios/hosts/iad2-mgmt-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/iad2-mgmt-hosts.cfg.j2 deleted file mode 100644 index 53713d6000..0000000000 --- a/roles/nagios_server/templates/nagios/hosts/iad2-mgmt-hosts.cfg.j2 +++ /dev/null @@ -1,23 +0,0 @@ -{% for host in vars['iad2_management_hosts']|sort %} -define host { - host_name {{ host }} - alias {{ host }} - use mincheck - address {{ host }} - parents iad2-gw -} -{% endfor %} - -## -## These hosts may have limited ssh/http/https - -{% for host in vars['iad2_management_limited']|sort %} -define host { - host_name {{ host }} - alias {{ host }} - use mincheck - address {{ host }} - parents iad2-gw -} -{% endfor %} - diff --git a/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2 index 8c4fde53c3..6346e9bda2 100644 --- a/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'ibiblio' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2 index cf3d407c46..13ee5336f5 100644 --- a/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'internetx' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2 index 64be9ec2c9..f2d3edf7ac 100644 --- a/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'osuosl' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 index 786c1a5823..e4eaa2e856 100644 --- a/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 @@ -3,8 +3,8 @@ define host { alias status.fedoraproject.org use mincheck address d6tcqd4og8l21.cloudfront.net -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw +{% if vars['nagios_location'] == 'rdu3_internal' %} + parents rdu3-gw {% else %} parents ibiblio-gw {% endif %} @@ -15,8 +15,8 @@ define host { alias download.copr.fedorainfracloud.org use mincheck address d1nld9ovj32u75.cloudfront.net -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw +{% if vars['nagios_location'] == 'rdu3_internal' %} + parents rdu3-gw {% else %} parents ibiblio-gw {% endif %} @@ -27,8 +27,8 @@ define host { alias cdn.registry.fedoraproject.org use mincheck address cdn.registry.fedoraproject.org -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw +{% if vars['nagios_location'] == 'rdu3_internal' %} + parents rdu3-gw {% else %} parents ibiblio-gw {% endif %} @@ -39,8 +39,8 @@ define host { alias lists.fedoraproject.org use mincheck address lists.fedoraproject.org -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw +{% if vars['nagios_location'] == 'rdu3_internal' %} + parents rdu3-gw {% else %} parents ibiblio-gw {% endif %} @@ -51,5 +51,5 @@ define host { alias retrace.fedoraproject.org use mincheck address retrace.fedoraproject.org - parents iad2-gw + parents rdu3-gw } diff --git a/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2 index ef8c49975e..b94a77c222 100644 --- a/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'rdu-cc' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' or vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2 index f306dc96e8..99aab8e200 100644 --- a/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2 @@ -1,7 +1,7 @@ {% for host in groups['all']|sort %} {% if hostvars[host].datacenter == 'rdu' and hostvars[host].nagios_Can_Connect == true %} define host { -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} use defaulttemplate {% else %} use mincheck diff --git a/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 index 6fa730de68..6a2617e9a9 100644 --- a/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 @@ -23,11 +23,11 @@ define host { {% endif %} {% if env == 'staging' %} ## Some staging parents do not allow ssh from staging. Just default to gw - parents iad2-gw + parents rdu3-gw {% elif hostvars[host]['vmhost'] is defined %} parents {{ hostvars[host]['vmhost'] }} {% elif hostvars[host].datacenter is defined %} - parents iad2-gw + parents rdu3-gw {% endif %} } diff --git a/roles/nagios_server/templates/nagios/services/iad2-mgmt.cfg.j2 b/roles/nagios_server/templates/nagios/services/rdu3-mgmt.cfg.j2 similarity index 89% rename from roles/nagios_server/templates/nagios/services/iad2-mgmt.cfg.j2 rename to roles/nagios_server/templates/nagios/services/rdu3-mgmt.cfg.j2 index d9e7f06d39..9686bacb1b 100644 --- a/roles/nagios_server/templates/nagios/services/iad2-mgmt.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/rdu3-mgmt.cfg.j2 @@ -1,6 +1,6 @@ # HTTP -{% for host in vars['iad2_management_hosts']|sort %} +{% for host in vars['rdu3_management_hosts']|sort %} define service { host_name {{ host }} service_description {{ host }}-http diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index efb27e6814..d030ee16e0 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -149,7 +149,7 @@ define service { use websitetemplate } -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} ## ## Other Frontend Websites @@ -256,12 +256,12 @@ define service { {% endif %} -{% if vars['nagios_location'] == 'iad2_internal' %} +{% if vars['nagios_location'] == 'rdu3_internal' %} define service { - host_name mailman01.iad2.fedoraproject.org + host_name mailman01.rdu3.fedoraproject.org service_description http-mailman-internal - check_command check_website!mailman01.iad2.fedoraproject.org!/archives/!Fedora Mailing-Lists + check_command check_website!mailman01.rdu3.fedoraproject.org!/archives/!Fedora Mailing-Lists use websitetemplate } diff --git a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 index 5db4d558f1..db17446467 100644 --- a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 +++ b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 @@ -96,7 +96,7 @@ nrpe_group=nrpe # NOTE: This option is ignored if NRPE is running under either inetd or xinetd #allowed_hosts=127.0.0.1,192.168.0.2 -allowed_hosts=10.3.163.10,10.16.163.10,127.0.0.1,192.168.1.10,192.168.1.20,192.168.1.166,38.145.60.15 +allowed_hosts=10.16.163.10,127.0.0.1,192.168.1.10,192.168.1.20,192.168.1.166,38.145.32.15 @@ -395,4 +395,4 @@ command[service_rsyslog_restart]=/usr/bin/sudo /sbin/service rsyslog restart #command[check_disk]=/usr/lib64/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ #command[check_procs]=/usr/lib64/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ -command[check_pgsql_backup]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /backups/db-fas01.iad2.fedoraproject.org/fas2.db +command[check_pgsql_backup]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /backups/db-fas01.rdu3.fedoraproject.org/fas2.db diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index af4d842bd6..8cac95f422 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -44,19 +44,6 @@ tags: - nfs/client -- name: Nfs mount points (iad2) - mount: > - name={{ mnt_dir }} - src=ntap-iad2-c02-fedora01-nfs01a:/{{ nfs_src_dir }} - fstype=nfs - opts={{nfs_mount_opts}} - passno=0 - dump=0 - state=mounted - when: ( datacenter == 'iad2' or datacenter == 'staging' ) and (env != 'staging' or mount_stg is defined) - tags: - - nfs/client - - name: Nfs mount points (rdu3) mount: > name={{ mnt_dir }} @@ -91,32 +78,6 @@ # should revisit how this role works. # -- name: Nfs mount points (stg) staging koji (iad2) - mount: > - name=/mnt/fedora_koji - src=10.3.167.64:/mnt/fedora_koji - fstype=nfs4 - opts=rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4 - passno=0 - dump=0 - state=mounted - when: datacenter == 'iad2' and env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname and not inventory_hostname.startswith('koji') - tags: - - nfs/client - -- name: Nfs mount points (stg) production koji ro (iad2) - mount: > - name=/mnt/fedora_koji_prod - src=ntap-iad2-c02-fedora01-nfs01a:/fedora_koji - fstype=nfs - opts=ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3 - passno=0 - dump=0 - state=mounted - when: datacenter == 'iad2' and env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname - tags: - - nfs/client - - name: Nfs mount points (stg) staging koji (rdu3) mount: > name=/mnt/fedora_koji @@ -139,6 +100,6 @@ passno=0 dump=0 state=mounted - when: datacenter == 'iad2' and env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname + when: datacenter == 'rdu3' and env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname tags: - nfs/client diff --git a/roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports b/roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports deleted file mode 100644 index 489abb8c76..0000000000 --- a/roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports +++ /dev/null @@ -1 +0,0 @@ -/mnt/fedora_koji 10.3.169.0/24(rw,no_root_squash) diff --git a/roles/nfs/server/files/koji01.rdu3.fedoraproject.org-exports b/roles/nfs/server/files/koji01.rdu3.fedoraproject.org-exports new file mode 100644 index 0000000000..d26f90fcd7 --- /dev/null +++ b/roles/nfs/server/files/koji01.rdu3.fedoraproject.org-exports @@ -0,0 +1 @@ +/mnt/fedora_koji 10.16.169.0/24(rw,no_root_squash) diff --git a/roles/nfs/server/files/koji01.stg.iad2.fedoraproject.org-exports b/roles/nfs/server/files/koji01.stg.iad2.fedoraproject.org-exports deleted file mode 100644 index e0e138f18e..0000000000 --- a/roles/nfs/server/files/koji01.stg.iad2.fedoraproject.org-exports +++ /dev/null @@ -1 +0,0 @@ -/mnt/fedora_koji 10.3.167.0/24(rw,no_root_squash) 10.3.166.0/24(ro,no_root_squash) diff --git a/roles/nfs/server/files/koji02.iad2.fedoraproject.org-exports b/roles/nfs/server/files/koji02.iad2.fedoraproject.org-exports deleted file mode 100644 index 489abb8c76..0000000000 --- a/roles/nfs/server/files/koji02.iad2.fedoraproject.org-exports +++ /dev/null @@ -1 +0,0 @@ -/mnt/fedora_koji 10.3.169.0/24(rw,no_root_squash) diff --git a/roles/nfs/server/files/koji02.rdu3.fedoraproject.org-exports b/roles/nfs/server/files/koji02.rdu3.fedoraproject.org-exports new file mode 100644 index 0000000000..d26f90fcd7 --- /dev/null +++ b/roles/nfs/server/files/koji02.rdu3.fedoraproject.org-exports @@ -0,0 +1 @@ +/mnt/fedora_koji 10.16.169.0/24(rw,no_root_squash) diff --git a/roles/opendkim/files/TrustedHosts b/roles/opendkim/files/TrustedHosts index d5442a41c1..f21f4174ba 100644 --- a/roles/opendkim/files/TrustedHosts +++ b/roles/opendkim/files/TrustedHosts @@ -5,7 +5,7 @@ # The localhost IP (127.0.0.1) should always be the first entry in this file. 127.0.0.1 ::1 -10.3.160.0/19 +10.16.160.0/19 192.168.0.0/16 3.225.109.36 18.208.24.211 diff --git a/roles/openshift-apps/firmitas/templates/certlist.yml.j2 b/roles/openshift-apps/firmitas/templates/certlist.yml.j2 index 8d506ee8bd..b9db56c769 100644 --- a/roles/openshift-apps/firmitas/templates/certlist.yml.j2 +++ b/roles/openshift-apps/firmitas/templates/certlist.yml.j2 @@ -847,7 +847,7 @@ pungi.stg: time: null path: pungi.stg.crt user: firmitas-automata -rabbitmq01.stg.iad2.fedoraproject.org: +rabbitmq01.stg.rdu3.fedoraproject.org: certstat: cstarted: true cstopped: false @@ -861,7 +861,7 @@ rabbitmq01.stg.iad2.fedoraproject.org: done: false link: null time: null - path: rabbitmq01.stg.iad2.fedoraproject.org.crt + path: rabbitmq01.stg.rdu3.fedoraproject.org.crt user: firmitas-automata rabbitmq01.stg.phx2.fedoraproject.org: certstat: @@ -879,7 +879,7 @@ rabbitmq01.stg.phx2.fedoraproject.org: time: null path: rabbitmq01.stg.phx2.fedoraproject.org.crt user: firmitas-automata -rabbitmq02.stg.iad2.fedoraproject.org: +rabbitmq02.stg.rdu3.fedoraproject.org: certstat: cstarted: true cstopped: false @@ -893,7 +893,7 @@ rabbitmq02.stg.iad2.fedoraproject.org: done: false link: null time: null - path: rabbitmq02.stg.iad2.fedoraproject.org.crt + path: rabbitmq02.stg.rdu3.fedoraproject.org.crt user: firmitas-automata rabbitmq02.stg.phx2.fedoraproject.org: certstat: @@ -911,7 +911,7 @@ rabbitmq02.stg.phx2.fedoraproject.org: time: null path: rabbitmq02.stg.phx2.fedoraproject.org.crt user: firmitas-automata -rabbitmq03.stg.iad2.fedoraproject.org: +rabbitmq03.stg.rdu3.fedoraproject.org: certstat: cstarted: true cstopped: false @@ -925,7 +925,7 @@ rabbitmq03.stg.iad2.fedoraproject.org: done: false link: null time: null - path: rabbitmq03.stg.iad2.fedoraproject.org.crt + path: rabbitmq03.stg.rdu3.fedoraproject.org.crt user: firmitas-automata rabbitmq03.stg.phx2.fedoraproject.org: certstat: diff --git a/roles/openshift-apps/mirrormanager/templates/ssh_known_hosts b/roles/openshift-apps/mirrormanager/templates/ssh_known_hosts index 3392b247f0..6203a3697f 100644 --- a/roles/openshift-apps/mirrormanager/templates/ssh_known_hosts +++ b/roles/openshift-apps/mirrormanager/templates/ssh_known_hosts @@ -1,2 +1,2 @@ -@cert-authority *.fedoraproject.org,*.rdu3.fedoraproject.org,*.iad2.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org -@cert-authority *.stg.s390.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.rdu3.fedoraproject.org,*.stg.iad2.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org +@cert-authority *.fedoraproject.org,*.rdu3.fedoraproject.org,*.fedorainfracloud.org,fedorapeople.org,pagure.io,*.fedorainfracloud.org,*.aws.fedoraproject.org,*.cloud.fedoraproject.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZDS6lxxFrx4c+voCOCwljEqBfqRrEIPQc+J7vCwiRptkFR2InBbvtsYZZElH6shR7YcHzWszNgFz1hAJO1z7AjA81li6esvKQfa4tfaI8Ryx8gHf8aXGjekioJ76T/CYQXHjOXHdKOkAQFMp7a3NmkyxTnt1027eBjSQ4pKnu+OCY5ujqp/hQOnTs67bNKHFljcF/Os7uBOM2EVgPFU/slJV321fBdw1fHFkzsu/AJDLr2RVUquZ6migYP0icEL8yRvriSi5Wbq9iGsoG+nrw5vNjD1TJxBfnMBxSVhzX3UgL5Ucg5Rl1Mx33olKTdSnFCLfWoYAdZs6m7I5/LXH+s2Qz4GobgxkKdWWQgZH+VjwUPgMJwyfkV1klWu9213fYnIiPVWHYIL5ESLHtOKjSaHy7SoEuv4WDq+KBwOFB6WO/v19YrgYJAHiJQ/By4AZyjdh3mVPPu4VeD1wuDUXtLbRjxJS7QodZrlr6BtjcQ/9l4xgbkX/RnpNAri8s/SMHaSCrpH9IsefV0owRkvadSGYBUp7VcBkiJ4zjMJwAfvFBrhVGN/C5nXbLIDYxsiKQP8Jp2KBAlprza7febpdDLglnVQqtjW9VgIUgcpYtrSi45ehJ7z1fpHTWW3Gz53e4s7v5znZ1iT/Nn+Cqzvw3yNtTbz706muEq6Y+EdYohQ== fedoraproject.org +@cert-authority *.stg.s390.fedoraproject.org,pagure-stg01.fedoraproject.org,*.stg.fedoraproject.org,*.stg.rdu3.fedoraproject.org,stg.pagure.io,*.aws.fedoraproject.org,*.fedorainfracloud.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDijAoR3tCmVi9yj0L4oaVfpHKIQoGYTVvSlXz6elL/X8YIbubVG6e0lhO3xadoD6wpi9+c1Zu3oc/WZAzx5/iuJD2m4cLgDdVt3CcAS4PyCW+YKI99pijlZlOHgBR/o3zU4PmERSViCYhGBYyBDlyiNg0H/cDQaAq91E5GenqKeujQM9ccAZT0lQ8OxiRo1RnUUTfz0wl9fxp3x6TKA43qT06MQf3oLE0nuUADiehmf9zUEraSwYlCcByXznDKSf2iWSyyvw6Fm9gNXn5V3Q2HXPlKUpXGZg49pT1VFy9SOsXPhKNcTZSpBKKuaLQvrSGh2QHdnbkjNMNe0bdE56zxT/tp9OhwXRGmXJpacocSHIuDGZmv+VBb/w6U4qMumB8zKOU00cMkakeUtT6DNwcAoKOipS0C8LPCbWe8L8QosMbRFgWT65gseW1POlHxi4o/uhSoVs/xmPS9J2GxtDd3Y2vf4F/lRKUdReMM7iU92Q5QBGUafF1NJz+Ez7jLkUwxmg9OBdwUxK2pyJPLNQ398YKMwwkwhfzIZVBRiAzbpds286WWOiTwMXa1i1Ei66bYXFmupp1OkuDcJYeb8gtrLkmx2t6bCgk8gsKlQrQZPdvPjqK0oBF5yZAHFTVycM4v7C15b+q1yYjqbBcsFsSxSvF3d+tZ8I/UZJFc7c70NQ== stg.fedoraproject.org diff --git a/roles/openshift-apps/openvpn/templates/deployment.yml.j2 b/roles/openshift-apps/openvpn/templates/deployment.yml.j2 index 9e741229a5..288326c560 100644 --- a/roles/openshift-apps/openvpn/templates/deployment.yml.j2 +++ b/roles/openshift-apps/openvpn/templates/deployment.yml.j2 @@ -6,10 +6,10 @@ metadata: annotations: image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"openvpn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"setup\")].image"},{"from":{"kind":"ImageStreamTag","name":"openvpn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"openvpn\")].image"}]' spec: -{% if datacenter == 'iad2' %} - replicas: {{ ocp_nodes | length }} -{% elif datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} replicas: {{ ocp_nodes_rdu3 | length }} +{% else %} + replicas: {{ ocp_nodes | length }} {% endif %} selector: matchLabels: diff --git a/roles/openshift-apps/openvpn/templates/secrets.yml.j2 b/roles/openshift-apps/openvpn/templates/secrets.yml.j2 index 6c4216b056..319cd25bdc 100644 --- a/roles/openshift-apps/openvpn/templates/secrets.yml.j2 +++ b/roles/openshift-apps/openvpn/templates/secrets.yml.j2 @@ -5,14 +5,14 @@ metadata: name: openvpn-certs data: ca.crt: {{ lookup('file', private+'/files/vpn/pki/ca.crt') | b64encode }} -{% if datacenter == 'iad2' %} -{% for node in ocp_nodes %} - {{node}}.crt: {{ lookup('file', private+'/files/vpn/pki/issued/'+node+'.crt') | b64encode }} - {{node}}.key: {{ lookup('file', private+'/files/vpn/pki/private/'+node+'.key') | b64encode }} -{% endfor %} -{% elif datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} {% for node in ocp_nodes_rdu3 %} {{node}}.crt: {{ lookup('file', private+'/files/vpn/pki/issued/'+node+'.crt') | b64encode }} {{node}}.key: {{ lookup('file', private+'/files/vpn/pki/private/'+node+'.key') | b64encode }} {% endfor %} +{% else %} +{% for node in ocp_nodes %} + {{node}}.crt: {{ lookup('file', private+'/files/vpn/pki/issued/'+node+'.crt') | b64encode }} + {{node}}.key: {{ lookup('file', private+'/files/vpn/pki/private/'+node+'.key') | b64encode }} +{% endfor %} {% endif %} diff --git a/roles/openshift-apps/testdays/templates/deploymentconfig.yml.j2 b/roles/openshift-apps/testdays/templates/deploymentconfig.yml.j2 index c05ff50a4a..02b93c7eb5 100644 --- a/roles/openshift-apps/testdays/templates/deploymentconfig.yml.j2 +++ b/roles/openshift-apps/testdays/templates/deploymentconfig.yml.j2 @@ -41,7 +41,7 @@ spec: - name: POSTGRESQL_DATABASE value: "{{ testdays_db_name }}" - name: POSTGRESQL_SERVICE_HOST - value: "db01{{ env_suffix }}.iad2.fedoraproject.org" + value: "db01{{ env_suffix }}.rdu3.fedoraproject.org" - name: POSTGRESQL_SERVICE_PORT value: "5432" - name: SECRET_KEY @@ -104,7 +104,7 @@ spec: - name: POSTGRESQL_DATABASE value: "{{ resultsdb_testdays_db_name }}" - name: POSTGRESQL_SERVICE_HOST - value: "db01{{ env_suffix }}.iad2.fedoraproject.org" + value: "db01{{ env_suffix }}.rdu3.fedoraproject.org" - name: POSTGRESQL_SERVICE_PORT value: "5432" - name: SECRET_KEY diff --git a/roles/openshift/project/defaults/main.yml b/roles/openshift/project/defaults/main.yml index ac1ed1c30c..83d61d7f35 100644 --- a/roles/openshift/project/defaults/main.yml +++ b/roles/openshift/project/defaults/main.yml @@ -1,6 +1,6 @@ --- project_allow_fas_db: false -project_allow_iad2: true +project_allow_rdu3: true project_allow_pod_creation: false egress_policy_template: "{{roles_path}}/openshift/project/templates/egresspolicy.yml.j2" diff --git a/roles/openshift/project/templates/egresspolicy.yml.j2 b/roles/openshift/project/templates/egresspolicy.yml.j2 index 23b2362bac..ec8f84ed2f 100644 --- a/roles/openshift/project/templates/egresspolicy.yml.j2 +++ b/roles/openshift/project/templates/egresspolicy.yml.j2 @@ -9,14 +9,14 @@ spec: {% if env == "staging" %} - type: Deny to: - cidrSelector: "10.3.166.34/32" + cidrSelector: "10.16.166.34/32" {% else %} - type: Deny to: - cidrSelector: "10.3.163.42/32" + cidrSelector: "10.16.163.42/32" {% endif %} {% endif %} -{% if not project_allow_iad2 %} +{% if not project_allow_rdu3 %} - type: Deny to: cidrSelector: "10.0.0.0/8" diff --git a/roles/openvpn/server/files/ccd/aarch64-test01.fedorainfracloud.org b/roles/openvpn/server/files/ccd/aarch64-test01.fedorainfracloud.org deleted file mode 100644 index 9e5ec009a4..0000000000 --- a/roles/openvpn/server/files/ccd/aarch64-test01.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.21 192.168.100.21 diff --git a/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org deleted file mode 100644 index ae1e4878df..0000000000 --- a/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.64 192.168.0.64 diff --git a/roles/openvpn/server/files/ccd/badges-backend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/badges-backend01.iad2.fedoraproject.org deleted file mode 100644 index 77c8f58554..0000000000 --- a/roles/openvpn/server/files/ccd/badges-backend01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.111 192.168.0.111 diff --git a/roles/openvpn/server/files/ccd/badges-web01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/badges-web01.iad2.fedoraproject.org deleted file mode 100644 index 94256cfab6..0000000000 --- a/roles/openvpn/server/files/ccd/badges-web01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.109 192.168.0.109 diff --git a/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org deleted file mode 100644 index cbc8399bf7..0000000000 --- a/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.41 192.168.0.41 diff --git a/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org deleted file mode 100644 index 7ecdb13a09..0000000000 --- a/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.99 192.168.0.99 diff --git a/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org deleted file mode 100644 index a2dd494820..0000000000 --- a/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.50 192.168.0.50 diff --git a/roles/openvpn/server/files/ccd/certgetter01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/certgetter01.iad2.fedoraproject.org deleted file mode 100644 index 6b4c08739a..0000000000 --- a/roles/openvpn/server/files/ccd/certgetter01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.177 192.168.0.177 diff --git a/roles/openvpn/server/files/ccd/certgetter01.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/certgetter01.rdu3.fedoraproject.org deleted file mode 100644 index de74342c99..0000000000 --- a/roles/openvpn/server/files/ccd/certgetter01.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.178 192.168.0.178 diff --git a/roles/openvpn/server/files/ccd/cloud-noc-os01.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/cloud-noc-os01.rdu-cc.fedoraproject.org deleted file mode 100644 index 21a270324d..0000000000 --- a/roles/openvpn/server/files/ccd/cloud-noc-os01.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.9 192.168.0.9 diff --git a/roles/openvpn/server/files/ccd/coloamer01.fedoraproject.org b/roles/openvpn/server/files/ccd/coloamer01.fedoraproject.org deleted file mode 100644 index bcabfc4f3b..0000000000 --- a/roles/openvpn/server/files/ccd/coloamer01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.89 192.168.0.89 diff --git a/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org deleted file mode 100644 index 7d8e263277..0000000000 --- a/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.104 192.168.0.104 diff --git a/roles/openvpn/server/files/ccd/datagrepper02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/datagrepper02.iad2.fedoraproject.org deleted file mode 100644 index 011d911a00..0000000000 --- a/roles/openvpn/server/files/ccd/datagrepper02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.105 192.168.0.105 diff --git a/roles/openvpn/server/files/ccd/debuginfod01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/debuginfod01.iad2.fedoraproject.org deleted file mode 100644 index cf2fe7c1f4..0000000000 --- a/roles/openvpn/server/files/ccd/debuginfod01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.165 192.168.0.165 diff --git a/roles/openvpn/server/files/ccd/dedicatedsolutions01.fedoraproject.org b/roles/openvpn/server/files/ccd/dedicatedsolutions01.fedoraproject.org deleted file mode 100644 index fc1a97dc1e..0000000000 --- a/roles/openvpn/server/files/ccd/dedicatedsolutions01.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.139 192.168.0.139 diff --git a/roles/openvpn/server/files/ccd/download-cc-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/download-cc-rdu01.fedoraproject.org deleted file mode 100644 index b1eeef3d8a..0000000000 --- a/roles/openvpn/server/files/ccd/download-cc-rdu01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.53 192.168.0.53 diff --git a/roles/openvpn/server/files/ccd/download-ib01.fedoraproject.org b/roles/openvpn/server/files/ccd/download-ib01.fedoraproject.org deleted file mode 100644 index 1d22335ba4..0000000000 --- a/roles/openvpn/server/files/ccd/download-ib01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.87 192.168.0.87 diff --git a/roles/openvpn/server/files/ccd/download-ib02.fedoraproject.org b/roles/openvpn/server/files/ccd/download-ib02.fedoraproject.org deleted file mode 100644 index 87c93b3a48..0000000000 --- a/roles/openvpn/server/files/ccd/download-ib02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.132 192.168.0.132 diff --git a/roles/openvpn/server/files/ccd/download-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/download-rdu01.fedoraproject.org deleted file mode 100644 index c7a07d6113..0000000000 --- a/roles/openvpn/server/files/ccd/download-rdu01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.84 192.168.0.84 diff --git a/roles/openvpn/server/files/ccd/el7-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/el7-test.fedorainfracloud.org deleted file mode 100644 index 7d9fe85722..0000000000 --- a/roles/openvpn/server/files/ccd/el7-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.18 192.168.100.18 diff --git a/roles/openvpn/server/files/ccd/el8-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/el8-test.fedorainfracloud.org deleted file mode 100644 index 5ca0f994a6..0000000000 --- a/roles/openvpn/server/files/ccd/el8-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.19 192.168.100.19 diff --git a/roles/openvpn/server/files/ccd/el9-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/el9-test.fedorainfracloud.org deleted file mode 100644 index 3b6136d2a1..0000000000 --- a/roles/openvpn/server/files/ccd/el9-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.31 192.168.100.31 diff --git a/roles/openvpn/server/files/ccd/f32-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/f32-test.fedorainfracloud.org deleted file mode 100644 index 7cc82fd473..0000000000 --- a/roles/openvpn/server/files/ccd/f32-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.14 192.168.100.14 diff --git a/roles/openvpn/server/files/ccd/f33-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/f33-test.fedorainfracloud.org deleted file mode 100644 index 9a6abce2ec..0000000000 --- a/roles/openvpn/server/files/ccd/f33-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.15 192.168.100.15 diff --git a/roles/openvpn/server/files/ccd/f36-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/f36-test.fedorainfracloud.org deleted file mode 100644 index f55a292eae..0000000000 --- a/roles/openvpn/server/files/ccd/f36-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.32 192.168.100.32 diff --git a/roles/openvpn/server/files/ccd/f38-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/f38-test.fedorainfracloud.org deleted file mode 100644 index 7c1846e40e..0000000000 --- a/roles/openvpn/server/files/ccd/f38-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.16 192.168.100.16 diff --git a/roles/openvpn/server/files/ccd/f39-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/f39-test.fedorainfracloud.org deleted file mode 100644 index 567a583f89..0000000000 --- a/roles/openvpn/server/files/ccd/f39-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.30 192.168.100.30 diff --git a/roles/openvpn/server/files/ccd/fedocal01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/fedocal01.iad2.fedoraproject.org deleted file mode 100644 index 9833798c05..0000000000 --- a/roles/openvpn/server/files/ccd/fedocal01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.95 192.168.0.95 diff --git a/roles/openvpn/server/files/ccd/fedocal02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/fedocal02.iad2.fedoraproject.org deleted file mode 100644 index f78c59f18d..0000000000 --- a/roles/openvpn/server/files/ccd/fedocal02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.96 192.168.0.96 diff --git a/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org deleted file mode 100644 index a78d135720..0000000000 --- a/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.133 192.168.0.133 diff --git a/roles/openvpn/server/files/ccd/host1plus01.fedoraproject.org b/roles/openvpn/server/files/ccd/host1plus01.fedoraproject.org deleted file mode 100644 index 68266e17eb..0000000000 --- a/roles/openvpn/server/files/ccd/host1plus01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.138 192.168.0.138 diff --git a/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org b/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org deleted file mode 100644 index bb2165503c..0000000000 --- a/roles/openvpn/server/files/ccd/ibiblio01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.40 192.168.0.40 diff --git a/roles/openvpn/server/files/ccd/ibiblio02.fedoraproject.org b/roles/openvpn/server/files/ccd/ibiblio02.fedoraproject.org deleted file mode 100644 index 06c21b67c4..0000000000 --- a/roles/openvpn/server/files/ccd/ibiblio02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.46 192.168.0.46 diff --git a/roles/openvpn/server/files/ccd/ibiblio05.fedoraproject.org b/roles/openvpn/server/files/ccd/ibiblio05.fedoraproject.org deleted file mode 100644 index fb36edc53e..0000000000 --- a/roles/openvpn/server/files/ccd/ibiblio05.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.147 192.168.0.147 diff --git a/roles/openvpn/server/files/ccd/internetx01.fedoraproject.org b/roles/openvpn/server/files/ccd/internetx01.fedoraproject.org deleted file mode 100644 index 86139b3e10..0000000000 --- a/roles/openvpn/server/files/ccd/internetx01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.76 192.168.0.76 - diff --git a/roles/openvpn/server/files/ccd/internetx02.fedoraproject.org b/roles/openvpn/server/files/ccd/internetx02.fedoraproject.org deleted file mode 100644 index 71804429ca..0000000000 --- a/roles/openvpn/server/files/ccd/internetx02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.77 192.168.0.77 - diff --git a/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org deleted file mode 100644 index dd1758f2bc..0000000000 --- a/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.156 192.168.0.156 diff --git a/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org deleted file mode 100644 index 60dbe68248..0000000000 --- a/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.157 192.168.0.157 diff --git a/roles/openvpn/server/files/ccd/ipa03.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipa03.iad2.fedoraproject.org deleted file mode 100644 index e6fe6f3c25..0000000000 --- a/roles/openvpn/server/files/ccd/ipa03.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -; ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.162 192.168.0.162 diff --git a/roles/openvpn/server/files/ccd/ipsilon01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipsilon01.iad2.fedoraproject.org deleted file mode 100644 index 48fda191a1..0000000000 --- a/roles/openvpn/server/files/ccd/ipsilon01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.143 192.168.0.143 diff --git a/roles/openvpn/server/files/ccd/ipsilon02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipsilon02.iad2.fedoraproject.org deleted file mode 100644 index 56b6a4e38d..0000000000 --- a/roles/openvpn/server/files/ccd/ipsilon02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.144 192.168.0.144 diff --git a/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org deleted file mode 100644 index 62b1c59019..0000000000 --- a/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.134 192.168.0.134 diff --git a/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org deleted file mode 100644 index 36059a914f..0000000000 --- a/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.59 192.168.0.59 diff --git a/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org deleted file mode 100644 index 42cda1090d..0000000000 --- a/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.118 192.168.0.118 diff --git a/roles/openvpn/server/files/ccd/mailman02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mailman02.iad2.fedoraproject.org deleted file mode 100644 index 8ec255fd7e..0000000000 --- a/roles/openvpn/server/files/ccd/mailman02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.119 192.168.0.119 diff --git a/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org deleted file mode 100644 index ef9ffc9426..0000000000 --- a/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.163 192.168.0.163 diff --git a/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org deleted file mode 100644 index 84e33f9dee..0000000000 --- a/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.100.11 192.168.100.11 diff --git a/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org deleted file mode 100644 index 92aa16542d..0000000000 --- a/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.141 192.168.1.141 diff --git a/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org deleted file mode 100644 index b300ba6b27..0000000000 --- a/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.10 192.168.0.10 diff --git a/roles/openvpn/server/files/ccd/noc01.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/noc01.rdu3.fedoraproject.org deleted file mode 100644 index 8e5938fc6c..0000000000 --- a/roles/openvpn/server/files/ccd/noc01.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.60 192.168.0.60 diff --git a/roles/openvpn/server/files/ccd/noc02.fedoraproject.org b/roles/openvpn/server/files/ccd/noc02.fedoraproject.org deleted file mode 100644 index 0bbfaa94e4..0000000000 --- a/roles/openvpn/server/files/ccd/noc02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.20 192.168.0.20 diff --git a/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org deleted file mode 100644 index 3aae1d284d..0000000000 --- a/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.80 192.168.0.80 diff --git a/roles/openvpn/server/files/ccd/ns02.fedoraproject.org b/roles/openvpn/server/files/ccd/ns02.fedoraproject.org deleted file mode 100644 index ce740f5a18..0000000000 --- a/roles/openvpn/server/files/ccd/ns02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.45 192.168.0.45 diff --git a/roles/openvpn/server/files/ccd/ns05.fedoraproject.org b/roles/openvpn/server/files/ccd/ns05.fedoraproject.org deleted file mode 100644 index c50ab72274..0000000000 --- a/roles/openvpn/server/files/ccd/ns05.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.57 192.168.0.57 diff --git a/roles/openvpn/server/files/ccd/ns13.rdu2.fedoraproject.org b/roles/openvpn/server/files/ccd/ns13.rdu2.fedoraproject.org deleted file mode 100644 index 4d04a62c36..0000000000 --- a/roles/openvpn/server/files/ccd/ns13.rdu2.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.85 192.168.0.85 diff --git a/roles/openvpn/server/files/ccd/nuancier01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/nuancier01.iad2.fedoraproject.org deleted file mode 100644 index d4b5fdcf08..0000000000 --- a/roles/openvpn/server/files/ccd/nuancier01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.112 192.168.0.112 diff --git a/roles/openvpn/server/files/ccd/nuancier02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/nuancier02.iad2.fedoraproject.org deleted file mode 100644 index f9e079d4e4..0000000000 --- a/roles/openvpn/server/files/ccd/nuancier02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.113 192.168.0.113 diff --git a/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org deleted file mode 100644 index 6a8829c7bb..0000000000 --- a/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.93 192.168.0.93 diff --git a/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org deleted file mode 100644 index cf4a1082c2..0000000000 --- a/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.168 192.168.0.168 diff --git a/roles/openvpn/server/files/ccd/oci-registry02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-registry02.iad2.fedoraproject.org deleted file mode 100644 index 86f8b27242..0000000000 --- a/roles/openvpn/server/files/ccd/oci-registry02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.169 192.168.0.169 diff --git a/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org deleted file mode 100644 index 7cef1f5500..0000000000 --- a/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.175 192.168.0.175 diff --git a/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org deleted file mode 100644 index cdae5634a8..0000000000 --- a/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.154 192.168.0.154 - diff --git a/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org deleted file mode 100644 index 8fea5162cd..0000000000 --- a/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.170 192.168.0.170 diff --git a/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org deleted file mode 100644 index e32832d3d7..0000000000 --- a/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.171 192.168.0.171 diff --git a/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org deleted file mode 100644 index cffb6aa038..0000000000 --- a/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.172 192.168.0.172 diff --git a/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org deleted file mode 100644 index 431d97ec5d..0000000000 --- a/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.173 192.168.0.173 diff --git a/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org deleted file mode 100644 index 0831a99310..0000000000 --- a/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.174 192.168.0.174 diff --git a/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org deleted file mode 100644 index 86a784401e..0000000000 --- a/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.181 192.168.0.181 diff --git a/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org deleted file mode 100644 index dbbf6f7034..0000000000 --- a/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.182 192.168.0.182 diff --git a/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org deleted file mode 100644 index 7c3e4518ae..0000000000 --- a/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.183 192.168.0.183 diff --git a/roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org deleted file mode 100644 index 4ebcc4302b..0000000000 --- a/roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.114 192.168.0.114 diff --git a/roles/openvpn/server/files/ccd/osuosl01.fedoraproject.org b/roles/openvpn/server/files/ccd/osuosl01.fedoraproject.org deleted file mode 100644 index 26c55ce090..0000000000 --- a/roles/openvpn/server/files/ccd/osuosl01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.62 192.168.0.62 diff --git a/roles/openvpn/server/files/ccd/osuosl02.fedoraproject.org b/roles/openvpn/server/files/ccd/osuosl02.fedoraproject.org deleted file mode 100644 index bc08140a40..0000000000 --- a/roles/openvpn/server/files/ccd/osuosl02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.67 192.168.0.67 diff --git a/roles/openvpn/server/files/ccd/pagure-stg01.fedoraproject.org b/roles/openvpn/server/files/ccd/pagure-stg01.fedoraproject.org deleted file mode 100644 index e323efed34..0000000000 --- a/roles/openvpn/server/files/ccd/pagure-stg01.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.100.7 192.168.100.7 diff --git a/roles/openvpn/server/files/ccd/pagure01.fedoraproject.org b/roles/openvpn/server/files/ccd/pagure01.fedoraproject.org deleted file mode 100644 index bd578427db..0000000000 --- a/roles/openvpn/server/files/ccd/pagure01.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.100.8 192.168.100.8 diff --git a/roles/openvpn/server/files/ccd/pagure02.fedoraproject.org b/roles/openvpn/server/files/ccd/pagure02.fedoraproject.org deleted file mode 100644 index 16558f97f0..0000000000 --- a/roles/openvpn/server/files/ccd/pagure02.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.100.13 192.168.100.13 diff --git a/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org deleted file mode 100644 index 27a65542ef..0000000000 --- a/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.5 192.168.0.5 diff --git a/roles/openvpn/server/files/ccd/pdc-web02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/pdc-web02.iad2.fedoraproject.org deleted file mode 100644 index 1bfa4957ef..0000000000 --- a/roles/openvpn/server/files/ccd/pdc-web02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.6 192.168.0.6 diff --git a/roles/openvpn/server/files/ccd/people01.fedoraproject.org b/roles/openvpn/server/files/ccd/people01.fedoraproject.org deleted file mode 100644 index 39ed86b578..0000000000 --- a/roles/openvpn/server/files/ccd/people01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.9 192.168.100.9 diff --git a/roles/openvpn/server/files/ccd/people02.fedoraproject.org b/roles/openvpn/server/files/ccd/people02.fedoraproject.org deleted file mode 100644 index 5ba41e7d16..0000000000 --- a/roles/openvpn/server/files/ccd/people02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.2 192.168.100.2 diff --git a/roles/openvpn/server/files/ccd/ppc64le-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/ppc64le-test.fedorainfracloud.org deleted file mode 100644 index 7b363216c4..0000000000 --- a/roles/openvpn/server/files/ccd/ppc64le-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.20 192.168.100.20 diff --git a/roles/openvpn/server/files/ccd/ppc64le-test02.fedorainfracloud.org b/roles/openvpn/server/files/ccd/ppc64le-test02.fedorainfracloud.org deleted file mode 100644 index 23a2a97aef..0000000000 --- a/roles/openvpn/server/files/ccd/ppc64le-test02.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.34 192.168.100.34 diff --git a/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org deleted file mode 100644 index 401ee218ea..0000000000 --- a/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.11 192.168.0.11 diff --git a/roles/openvpn/server/files/ccd/proxy01.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy01.rdu3.fedoraproject.org deleted file mode 100644 index 03ced3412c..0000000000 --- a/roles/openvpn/server/files/ccd/proxy01.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.16 192.168.0.16 diff --git a/roles/openvpn/server/files/ccd/proxy02.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy02.fedoraproject.org deleted file mode 100644 index 886f41c7cd..0000000000 --- a/roles/openvpn/server/files/ccd/proxy02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.12 192.168.0.12 diff --git a/roles/openvpn/server/files/ccd/proxy03.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy03.fedoraproject.org deleted file mode 100644 index ebcb3ed188..0000000000 --- a/roles/openvpn/server/files/ccd/proxy03.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.7 192.168.0.7 diff --git a/roles/openvpn/server/files/ccd/proxy04.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy04.fedoraproject.org deleted file mode 100644 index 38e9417354..0000000000 --- a/roles/openvpn/server/files/ccd/proxy04.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.14 192.168.0.14 diff --git a/roles/openvpn/server/files/ccd/proxy05.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy05.fedoraproject.org deleted file mode 100644 index 4a1220eace..0000000000 --- a/roles/openvpn/server/files/ccd/proxy05.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.25 192.168.0.25 diff --git a/roles/openvpn/server/files/ccd/proxy06.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy06.fedoraproject.org deleted file mode 100644 index df290034b7..0000000000 --- a/roles/openvpn/server/files/ccd/proxy06.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.63 192.168.0.63 diff --git a/roles/openvpn/server/files/ccd/proxy09.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy09.fedoraproject.org deleted file mode 100644 index f40c7e8ae7..0000000000 --- a/roles/openvpn/server/files/ccd/proxy09.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.15 192.168.0.15 diff --git a/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org deleted file mode 100644 index 55c0293dc8..0000000000 --- a/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.17 192.168.0.17 diff --git a/roles/openvpn/server/files/ccd/proxy101.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy101.iad2.fedoraproject.org deleted file mode 100644 index 80e0735342..0000000000 --- a/roles/openvpn/server/files/ccd/proxy101.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.18 192.168.0.18 diff --git a/roles/openvpn/server/files/ccd/proxy11.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy11.fedoraproject.org deleted file mode 100644 index bf56c35cb8..0000000000 --- a/roles/openvpn/server/files/ccd/proxy11.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.37 192.168.0.37 diff --git a/roles/openvpn/server/files/ccd/proxy110.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy110.iad2.fedoraproject.org deleted file mode 100644 index 75df263f9f..0000000000 --- a/roles/openvpn/server/files/ccd/proxy110.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.19 192.168.0.19 diff --git a/roles/openvpn/server/files/ccd/proxy12.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy12.fedoraproject.org deleted file mode 100644 index ab8ce5d412..0000000000 --- a/roles/openvpn/server/files/ccd/proxy12.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.13 192.168.0.13 diff --git a/roles/openvpn/server/files/ccd/proxy13.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy13.fedoraproject.org deleted file mode 100644 index 20c1fb380d..0000000000 --- a/roles/openvpn/server/files/ccd/proxy13.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.158 192.168.0.158 diff --git a/roles/openvpn/server/files/ccd/proxy14.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy14.fedoraproject.org deleted file mode 100644 index a5900e6b54..0000000000 --- a/roles/openvpn/server/files/ccd/proxy14.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.159 192.168.0.159 diff --git a/roles/openvpn/server/files/ccd/proxy30.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy30.fedoraproject.org deleted file mode 100644 index c6ae5c503b..0000000000 --- a/roles/openvpn/server/files/ccd/proxy30.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.190 192.168.0.190 diff --git a/roles/openvpn/server/files/ccd/proxy31.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy31.fedoraproject.org deleted file mode 100644 index 101f41f5be..0000000000 --- a/roles/openvpn/server/files/ccd/proxy31.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.191 192.168.0.191 diff --git a/roles/openvpn/server/files/ccd/proxy32.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy32.fedoraproject.org deleted file mode 100644 index 1402073c8d..0000000000 --- a/roles/openvpn/server/files/ccd/proxy32.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.192 192.168.0.192 diff --git a/roles/openvpn/server/files/ccd/proxy33.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy33.fedoraproject.org deleted file mode 100644 index a7542edc33..0000000000 --- a/roles/openvpn/server/files/ccd/proxy33.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.193 192.168.0.193 diff --git a/roles/openvpn/server/files/ccd/proxy34.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy34.fedoraproject.org deleted file mode 100644 index 20f6ba428c..0000000000 --- a/roles/openvpn/server/files/ccd/proxy34.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.194 192.168.0.194 diff --git a/roles/openvpn/server/files/ccd/proxy35.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy35.fedoraproject.org deleted file mode 100644 index c5f309521e..0000000000 --- a/roles/openvpn/server/files/ccd/proxy35.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.195 192.168.0.195 diff --git a/roles/openvpn/server/files/ccd/proxy36.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy36.fedoraproject.org deleted file mode 100644 index 9995093293..0000000000 --- a/roles/openvpn/server/files/ccd/proxy36.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.196 192.168.0.196 diff --git a/roles/openvpn/server/files/ccd/proxy37.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy37.fedoraproject.org deleted file mode 100644 index d29e59e2e3..0000000000 --- a/roles/openvpn/server/files/ccd/proxy37.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.197 192.168.0.197 - diff --git a/roles/openvpn/server/files/ccd/proxy38.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy38.fedoraproject.org deleted file mode 100644 index e62dd89f70..0000000000 --- a/roles/openvpn/server/files/ccd/proxy38.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.198 192.168.0.198 - diff --git a/roles/openvpn/server/files/ccd/proxy39.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy39.fedoraproject.org deleted file mode 100644 index b67eb80fcd..0000000000 --- a/roles/openvpn/server/files/ccd/proxy39.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.199 192.168.0.199 - diff --git a/roles/openvpn/server/files/ccd/proxy40.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy40.fedoraproject.org deleted file mode 100644 index 7aa42fec2c..0000000000 --- a/roles/openvpn/server/files/ccd/proxy40.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.200 192.168.0.200 - diff --git a/roles/openvpn/server/files/ccd/rawhide-test.fedorainfracloud.org b/roles/openvpn/server/files/ccd/rawhide-test.fedorainfracloud.org deleted file mode 100644 index 494afd4149..0000000000 --- a/roles/openvpn/server/files/ccd/rawhide-test.fedorainfracloud.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.17 192.168.100.17 diff --git a/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org deleted file mode 100644 index f1420d9f31..0000000000 --- a/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.137 192.168.0.137 diff --git a/roles/openvpn/server/files/ccd/retrace03.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/retrace03.rdu-cc.fedoraproject.org deleted file mode 100644 index 0074dda18e..0000000000 --- a/roles/openvpn/server/files/ccd/retrace03.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.36 192.168.0.36 diff --git a/roles/openvpn/server/files/ccd/smtp-auth-cc-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/smtp-auth-cc-rdu01.fedoraproject.org deleted file mode 100644 index 37f9b5058e..0000000000 --- a/roles/openvpn/server/files/ccd/smtp-auth-cc-rdu01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.34 192.168.0.34 diff --git a/roles/openvpn/server/files/ccd/smtp-mm-cc-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/smtp-mm-cc-rdu01.fedoraproject.org deleted file mode 100644 index 095192d1da..0000000000 --- a/roles/openvpn/server/files/ccd/smtp-mm-cc-rdu01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.55 192.168.0.55 diff --git a/roles/openvpn/server/files/ccd/smtp-mm-ib01.fedoraproject.org b/roles/openvpn/server/files/ccd/smtp-mm-ib01.fedoraproject.org deleted file mode 100644 index 2649130d6b..0000000000 --- a/roles/openvpn/server/files/ccd/smtp-mm-ib01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.83 192.168.0.83 diff --git a/roles/openvpn/server/files/ccd/smtp-mm-osuosl01.fedoraproject.org b/roles/openvpn/server/files/ccd/smtp-mm-osuosl01.fedoraproject.org deleted file mode 100644 index 2aed8866a3..0000000000 --- a/roles/openvpn/server/files/ccd/smtp-mm-osuosl01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.23 192.168.0.23 diff --git a/roles/openvpn/server/files/ccd/storinator01.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/storinator01.rdu-cc.fedoraproject.org deleted file mode 100644 index 1351185f14..0000000000 --- a/roles/openvpn/server/files/ccd/storinator01.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.32 192.168.1.32 diff --git a/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org deleted file mode 100644 index 853b768a97..0000000000 --- a/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.127 192.168.0.127 diff --git a/roles/openvpn/server/files/ccd/sundries02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/sundries02.iad2.fedoraproject.org deleted file mode 100644 index 64a3b7c7e1..0000000000 --- a/roles/openvpn/server/files/ccd/sundries02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.128 192.168.0.128 diff --git a/roles/openvpn/server/files/ccd/torrent01.fedoraproject.org b/roles/openvpn/server/files/ccd/torrent01.fedoraproject.org deleted file mode 100644 index 1a08444d1c..0000000000 --- a/roles/openvpn/server/files/ccd/torrent01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.126 192.168.0.126 diff --git a/roles/openvpn/server/files/ccd/torrent02.fedoraproject.org b/roles/openvpn/server/files/ccd/torrent02.fedoraproject.org deleted file mode 100644 index b363dae354..0000000000 --- a/roles/openvpn/server/files/ccd/torrent02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.74 192.168.0.74 diff --git a/roles/openvpn/server/files/ccd/unbound-cc-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/unbound-cc-rdu01.fedoraproject.org deleted file mode 100644 index 2c89238323..0000000000 --- a/roles/openvpn/server/files/ccd/unbound-cc-rdu01.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.30 192.168.0.30 diff --git a/roles/openvpn/server/files/ccd/unbound-ib01.fedoraproject.org b/roles/openvpn/server/files/ccd/unbound-ib01.fedoraproject.org deleted file mode 100644 index 38c178875c..0000000000 --- a/roles/openvpn/server/files/ccd/unbound-ib01.fedoraproject.org +++ /dev/null @@ -1 +0,0 @@ -ifconfig-push 192.168.1.29 192.168.0.29 diff --git a/roles/openvpn/server/files/ccd/unbound-osuosl01.fedoraproject.org b/roles/openvpn/server/files/ccd/unbound-osuosl01.fedoraproject.org deleted file mode 100644 index 462207352f..0000000000 --- a/roles/openvpn/server/files/ccd/unbound-osuosl01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.54 192.168.0.54 diff --git a/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org deleted file mode 100644 index 4f7ffc01fd..0000000000 --- a/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.28 192.168.0.28 diff --git a/roles/openvpn/server/files/ccd/value02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/value02.iad2.fedoraproject.org deleted file mode 100644 index 86cdbeb162..0000000000 --- a/roles/openvpn/server/files/ccd/value02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.33 192.168.0.33 diff --git a/roles/openvpn/server/files/ccd/virthost-cc-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/virthost-cc-rdu01.fedoraproject.org deleted file mode 100644 index ae0a92b25b..0000000000 --- a/roles/openvpn/server/files/ccd/virthost-cc-rdu01.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.161 192.168.0.161 diff --git a/roles/openvpn/server/files/ccd/virthost-cc-rdu02.fedoraproject.org b/roles/openvpn/server/files/ccd/virthost-cc-rdu02.fedoraproject.org deleted file mode 100644 index 9ac160e0ff..0000000000 --- a/roles/openvpn/server/files/ccd/virthost-cc-rdu02.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.145 192.168.0.145 diff --git a/roles/openvpn/server/files/ccd/virthost-cc-rdu03.fedoraproject.org b/roles/openvpn/server/files/ccd/virthost-cc-rdu03.fedoraproject.org deleted file mode 100644 index 2dba8cacf8..0000000000 --- a/roles/openvpn/server/files/ccd/virthost-cc-rdu03.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.146 192.168.0.146 diff --git a/roles/openvpn/server/files/ccd/vmhost-a64-cc01.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-a64-cc01.rdu-cc.fedoraproject.org deleted file mode 100644 index 6272f03111..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-a64-cc01.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.26 192.168.0.26 diff --git a/roles/openvpn/server/files/ccd/vmhost-p08-copr01.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-p08-copr01.rdu-cc.fedoraproject.org deleted file mode 100644 index d3064afa90..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-p08-copr01.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.26 192.168.100.26 diff --git a/roles/openvpn/server/files/ccd/vmhost-p08-copr02.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-p08-copr02.rdu-cc.fedoraproject.org deleted file mode 100644 index 66be527032..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-p08-copr02.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.29 192.168.100.29 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu05.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu05.rdu-cc.fedoraproject.org deleted file mode 100644 index 36bbe50565..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu05.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.21 192.168.0.21 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu06.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu06.rdu-cc.fedoraproject.org deleted file mode 100644 index dd4f17b220..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-cc-rdu06.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.22 192.168.0.22 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-cc01.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-cc01.rdu-cc.fedoraproject.org deleted file mode 100644 index c47b2c043a..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-cc01.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.160 192.168.0.160 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-copr01.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-copr01.rdu-cc.fedoraproject.org deleted file mode 100644 index 699cc301f2..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-copr01.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.22 192.168.100.22 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-copr02.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-copr02.rdu-cc.fedoraproject.org deleted file mode 100644 index c87181776b..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-copr02.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.23 192.168.100.23 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-copr03.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-copr03.rdu-cc.fedoraproject.org deleted file mode 100644 index 474130a007..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-copr03.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.24 192.168.100.24 diff --git a/roles/openvpn/server/files/ccd/vmhost-x86-copr04.rdu-cc.fedoraproject.org b/roles/openvpn/server/files/ccd/vmhost-x86-copr04.rdu-cc.fedoraproject.org deleted file mode 100644 index d6fef8d48f..0000000000 --- a/roles/openvpn/server/files/ccd/vmhost-x86-copr04.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.100.25 192.168.100.25 diff --git a/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org deleted file mode 100644 index bc933a9050..0000000000 --- a/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.129 192.168.0.129 diff --git a/roles/openvpn/server/files/ccd/wiki02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/wiki02.iad2.fedoraproject.org deleted file mode 100644 index c3e30a08ac..0000000000 --- a/roles/openvpn/server/files/ccd/wiki02.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -# ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.130 192.168.0.130 diff --git a/roles/openvpn/server/files/ccd/worker01.ocp.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/worker01.ocp.iad2.fedoraproject.org deleted file mode 100644 index 78c3ad91aa..0000000000 --- a/roles/openvpn/server/files/ccd/worker01.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.205 192.168.0.205 - diff --git a/roles/openvpn/server/files/ccd/worker01.ocp.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/worker01.ocp.rdu3.fedoraproject.org deleted file mode 100644 index 8a34c42735..0000000000 --- a/roles/openvpn/server/files/ccd/worker01.ocp.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.68 192.168.0.68 - diff --git a/roles/openvpn/server/files/ccd/worker02.ocp.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/worker02.ocp.iad2.fedoraproject.org deleted file mode 100644 index ccd390609e..0000000000 --- a/roles/openvpn/server/files/ccd/worker02.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.206 192.168.0.206 - diff --git a/roles/openvpn/server/files/ccd/worker02.ocp.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/worker02.ocp.rdu3.fedoraproject.org deleted file mode 100644 index 7285779a67..0000000000 --- a/roles/openvpn/server/files/ccd/worker02.ocp.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.69 192.168.0.69 - diff --git a/roles/openvpn/server/files/ccd/worker03.ocp.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/worker03.ocp.iad2.fedoraproject.org deleted file mode 100644 index dd278de15c..0000000000 --- a/roles/openvpn/server/files/ccd/worker03.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.207 192.168.0.207 - diff --git a/roles/openvpn/server/files/ccd/worker03.ocp.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/worker03.ocp.rdu3.fedoraproject.org deleted file mode 100644 index bd432de2ef..0000000000 --- a/roles/openvpn/server/files/ccd/worker03.ocp.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.70 192.168.0.70 - diff --git a/roles/openvpn/server/files/ccd/worker04.ocp.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/worker04.ocp.iad2.fedoraproject.org deleted file mode 100644 index c1bfe00581..0000000000 --- a/roles/openvpn/server/files/ccd/worker04.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.208 192.168.0.208 - diff --git a/roles/openvpn/server/files/ccd/worker04.ocp.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/worker04.ocp.rdu3.fedoraproject.org deleted file mode 100644 index 81f423c12c..0000000000 --- a/roles/openvpn/server/files/ccd/worker04.ocp.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.71 192.168.0.71 - diff --git a/roles/openvpn/server/files/ccd/worker05.ocp.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/worker05.ocp.iad2.fedoraproject.org deleted file mode 100644 index b83281f520..0000000000 --- a/roles/openvpn/server/files/ccd/worker05.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.209 192.168.0.209 - diff --git a/roles/openvpn/server/files/ccd/worker05.ocp.rdu3.fedoraproject.org b/roles/openvpn/server/files/ccd/worker05.ocp.rdu3.fedoraproject.org deleted file mode 100644 index ce88b10693..0000000000 --- a/roles/openvpn/server/files/ccd/worker05.ocp.rdu3.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.72 192.168.0.72 - diff --git a/roles/openvpn/server/files/ccd/worker06.ocp.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/worker06.ocp.iad2.fedoraproject.org deleted file mode 100644 index 63de7727de..0000000000 --- a/roles/openvpn/server/files/ccd/worker06.ocp.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.210 192.168.0.210 - diff --git a/roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org deleted file mode 100644 index 398591e4ec..0000000000 --- a/roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ -ifconfig-push 192.168.1.211 192.168.0.211 - diff --git a/roles/openvpn/server/tasks/main.yml b/roles/openvpn/server/tasks/main.yml index db42abd76b..d9a0e2a17a 100644 --- a/roles/openvpn/server/tasks/main.yml +++ b/roles/openvpn/server/tasks/main.yml @@ -42,15 +42,6 @@ - install - openvpn -- name: Install the ccd files (iad2) - synchronize: - src: ccd/ - dest: /etc/openvpn/server/ccd/ - delete: yes - tags: - - openvpn - when: datacenter == 'iad2' - - name: Install the ccd files (rdu3) synchronize: src: ccd-rdu3/ diff --git a/roles/people/templates/sssd.conf b/roles/people/templates/sssd.conf index 8cfe3fbae0..74053c2ea1 100644 --- a/roles/people/templates/sssd.conf +++ b/roles/people/templates/sssd.conf @@ -8,7 +8,7 @@ auth_provider = ipa access_provider = ipa ipa_hostname = people01.fedoraproject.org chpass_provider = ipa -ipa_server = _srv_, ipa01.iad2.fedoraproject.org, ipa02.iad2.fedoraproject.org, ipa03.iad2.fedoraproject.org +ipa_server = _srv_, ipa01.rdu3.fedoraproject.org, ipa02.rdu3.fedoraproject.org, ipa03.rdu3.fedoraproject.org ldap_tls_cacert = /etc/ipa/ca.crt subdomain_inherit = ignore_group_members, ldap_purge_cache_timeout ignore_group_members = True diff --git a/roles/postgresql_server/files/pg_hba.conf b/roles/postgresql_server/files/pg_hba.conf index e6e836d3e9..2e6154dfee 100644 --- a/roles/postgresql_server/files/pg_hba.conf +++ b/roles/postgresql_server/files/pg_hba.conf @@ -71,7 +71,7 @@ #host all all ::1/128 @authmethod@ local all all ident -host koji koji 10.3.167.64 255.255.255.255 md5 +host koji koji 10.16.167.64 255.255.255.255 md5 host all all 0.0.0.0 0.0.0.0 md5 host replication all 0.0.0.0 0.0.0.0 md5 # Note, I can't think of a reason to make this more restrictive than ipv4 but diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index b181e42b27..de025d1e09 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -104,7 +104,7 @@ - name: Copy over backup scriplet ansible.builtin.copy: src=backup-database dest=/usr/local/bin/backup-database mode=0755 - when: not inventory_hostname.startswith(('db-koji01.iad2', 'db-koji01.rdu3', 'db-datanommer')) + when: not inventory_hostname.startswith(('db-koji01.rdu3', 'db-datanommer')) tags: - postgresql @@ -112,13 +112,13 @@ # backup script. Smaller koji's are fine with the default N backups. - name: Copy over backup scriplet ansible.builtin.copy: src=backup-database.db-koji01 dest=/usr/local/bin/backup-database mode=0755 - when: inventory_hostname.startswith(('db-koji01.iad2', 'db-koji01.rdu3')) + when: inventory_hostname.startswith('db-koji01.rdu3') tags: - postgresql - name: Copy over backup scriplet ansible.builtin.copy: src=backup-database.db-datanommer02 dest=/usr/local/bin/backup-database mode=0755 - when: inventory_hostname.startswith(('db-datanommer02.iad2', 'db-datanommer02.rdu3')) + when: inventory_hostname.startswith('db-datanommer02.rdu3') tags: - postgresql @@ -126,13 +126,13 @@ ansible.builtin.copy: src=backup-database.anitya dest=/usr/local/bin/backup-database.anitya mode=0755 tags: - postgresql - when: inventory_hostname.startswith(('db01.iad2', 'db01.rdu3')) + when: inventory_hostname.startswith('db01.rdu3') - name: Copy over anitya public backup cron ansible.builtin.copy: src=cron-backup-anitya-public dest=/etc/cron.d/cron-backup-anitya-public mode=0644 tags: - postgresql - when: inventory_hostname.startswith(('db01.iad2', 'db01.rdu3')) + when: inventory_hostname.startswith('db01.rdu3') - name: Set up some cronjobs to backup databases as configured ansible.builtin.template: > diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml index 31ee2e4a53..0e6eb72625 100644 --- a/roles/rabbitmq_cluster/tasks/main.yml +++ b/roles/rabbitmq_cluster/tasks/main.yml @@ -91,18 +91,6 @@ - rabbitmq_cluster - config -- name: Deploy configuration - ansible.builtin.template: src={{item}}.j2 dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644 - with_items: - - rabbitmq.config - - rabbitmq-env.conf - when: "datacenter == 'iad2'" - notify: - - Restart rabbitmq - tags: - - rabbitmq_cluster - - config - - name: Deploy configuration ansible.builtin.template: src={{item}}.j2 dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index a961647a63..1eca6fe5ad 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -252,7 +252,7 @@ - rpm-ostree tags: - releng - when: inventory_hostname.startswith('compose-rawhide01.iad2') + when: inventory_hostname.startswith('compose-rawhide01.rdu3') - name: Add pkgs from infrastructure testing repo ansible.builtin.dnf: @@ -300,7 +300,7 @@ src: branched.j2 dest: /etc/cron.d/branched mode: "644" - when: inventory_hostname.startswith('compose-branched01.iad2') + when: inventory_hostname.startswith('compose-branched01.rdu3') # put cron job in for rawhide compose - name: Rawhide compose cron @@ -308,7 +308,7 @@ src: rawhide dest: /etc/cron.d/rawhide mode: "644" - when: inventory_hostname.startswith('compose-rawhide01.iad2') + when: inventory_hostname.startswith('compose-rawhide01.rdu3') # put cron job in for cloud nightly compose - name: Cloud updates compose cron @@ -316,7 +316,7 @@ src: cloud-updates.j2 dest: /etc/cron.d/cloud-updates mode: "644" - when: inventory_hostname.startswith('compose-x86-01.iad2') + when: inventory_hostname.startswith('compose-x86-01.rdu3') # put cron job in for docker nightly compose - name: Docker compose cron @@ -324,7 +324,7 @@ src: container-updates.j2 dest: /etc/cron.d/container-updates mode: "644" - when: inventory_hostname.startswith('compose-x86-01.iad2') + when: inventory_hostname.startswith('compose-x86-01.rdu3') # put cron job in for IoT stable compose - name: IoT stable compose cron @@ -332,7 +332,7 @@ src: stable-iot dest: /etc/cron.d/stable-iot mode: "644" - when: inventory_hostname.startswith('compose-iot01.iad2') + when: inventory_hostname.startswith('compose-iot01.rdu3') # put cron job in for IoT rawhide compose - name: IoT rawhide compose cron @@ -340,7 +340,7 @@ src: rawhide-iot dest: /etc/cron.d/rawhide-iot mode: "644" - when: inventory_hostname.startswith('compose-iot01.iad2') + when: inventory_hostname.startswith('compose-iot01.rdu3') # put cron job in for ELN compose - name: ELN compose cron @@ -348,7 +348,7 @@ src: eln dest: /etc/cron.d/eln mode: "644" - when: inventory_hostname.startswith('compose-eln01.iad2') + when: inventory_hostname.startswith('compose-eln01.rdu3') # put cron job in for enforcing FESCo SIG Policy # https://docs.fedoraproject.org/en-US/fesco/SIG_policy/ @@ -357,7 +357,7 @@ src: sig_policy.j2 dest: /etc/cron.d/sig_policy mode: "644" - when: inventory_hostname.startswith('compose-x86-01.iad2') + when: inventory_hostname.startswith('compose-x86-01.rdu3') tags: - cronjob diff --git a/roles/releng/templates/cloud-updates.j2 b/roles/releng/templates/cloud-updates.j2 index a7c084d99e..ea3a34b8e9 100644 --- a/roles/releng/templates/cloud-updates.j2 +++ b/roles/releng/templates/cloud-updates.j2 @@ -1,4 +1,4 @@ -{% if datacenter == 'iad2' %} +{% if datacenter == 'rdu3' %} # Fedora {{ FedoraCycleNumber }} Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org 15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates diff --git a/roles/releng/templates/container-updates.j2 b/roles/releng/templates/container-updates.j2 index 84be2270c3..64eb02fbdb 100644 --- a/roles/releng/templates/container-updates.j2 +++ b/roles/releng/templates/container-updates.j2 @@ -1,4 +1,4 @@ -{% if datacenter == 'iad2' %} +{% if datacenter == 'rdu3' %} # Fedora {{ FedoraCycleNumber }} Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org 45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF{{ FedoraCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates diff --git a/roles/releng/templates/rawhide.j2 b/roles/releng/templates/rawhide.j2 index 1c7d134923..913756cf7c 100644 --- a/roles/releng/templates/rawhide.j2 +++ b/roles/releng/templates/rawhide.j2 @@ -1,4 +1,4 @@ -{% if datacenter == 'iad2' %} +{% if datacenter == 'rdu3' %} # rawhide compose MAILTO=releng-cron@lists.fedoraproject.org 15 5 * * * root touch /tmp/fedora-compose-rawhide && TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && /usr/local/bin/lock-wrapper rawhide-compose "LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary && rm /tmp/fedora-compose-rawhide diff --git a/roles/releng/templates/sig_policy.j2 b/roles/releng/templates/sig_policy.j2 index af1a277272..966e41e77b 100644 --- a/roles/releng/templates/sig_policy.j2 +++ b/roles/releng/templates/sig_policy.j2 @@ -1,4 +1,4 @@ -{% if datacenter == 'iad2' %} +{% if datacenter == 'rdu3' %} # Runs the `sig_policy.py` script MAILTO=releng-cron@lists.fedoraproject.org PAGURE_API_TOKEN={{ fesco_sig_policy_src_token }} diff --git a/roles/robosignatory/files/sigul.production.conf b/roles/robosignatory/files/sigul.production.conf index 1f3c47abdb..a137e18fd1 100644 --- a/roles/robosignatory/files/sigul.production.conf +++ b/roles/robosignatory/files/sigul.production.conf @@ -1,6 +1,6 @@ [client] -bridge-hostname: sign-bridge.iad2.fedoraproject.org -server-hostname: sign-vault.iad2.fedoraproject.org +bridge-hostname: sign-bridge.rdu3.fedoraproject.org +server-hostname: sign-vault.rdu3.fedoraproject.org client-cert-nickname: autopen user-name: autopen diff --git a/roles/rsyncd/files/rsyncd.conf.crawler b/roles/rsyncd/files/rsyncd.conf.crawler index 5079b10253..c705016e2d 100644 --- a/roles/rsyncd/files/rsyncd.conf.crawler +++ b/roles/rsyncd/files/rsyncd.conf.crawler @@ -13,7 +13,7 @@ path = /var/log/mirrormanager/crawler uid = mirrormanager gid = mirrormanager read only = yes -hosts allow = mm-frontend01.iad2.fedoraproject.org mm-frontend02.iad2.fedoraproject.org 209.132.181.102 +hosts allow = mm-frontend01.rdu3.fedoraproject.org mm-frontend02.rdu3.fedoraproject.org 209.132.181.102 # For distributing propagation logs to the mm backend [propagation] @@ -22,4 +22,4 @@ path = /var/log/mirrormanager/propagation uid = mirrormanager gid = mirrormanager read only = yes -hosts allow = mm-backend01.iad2.fedoraproject.org +hosts allow = mm-backend01.rdu3.fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.default b/roles/rsyncd/files/rsyncd.conf.default index 85d1aa43b8..fb701133a9 100644 --- a/roles/rsyncd/files/rsyncd.conf.default +++ b/roles/rsyncd/files/rsyncd.conf.default @@ -13,4 +13,4 @@ path = /var/log uid = root gid = root read only = yes -hosts allow = 192.168.1.59 10.3.163.39 10.16.163.39 192.168.1.66 +hosts allow = 192.168.1.59 10.16.163.39 192.168.1.66 diff --git a/roles/rsyncd/files/rsyncd.conf.people01.fedoraproject.org b/roles/rsyncd/files/rsyncd.conf.people01.fedoraproject.org index 770f877c64..e9d95e48e0 100644 --- a/roles/rsyncd/files/rsyncd.conf.people01.fedoraproject.org +++ b/roles/rsyncd/files/rsyncd.conf.people01.fedoraproject.org @@ -13,7 +13,7 @@ path = /var/log uid = root gid = root read only = yes -hosts allow = 10.3.163.39 192.168.1.59 10.16.163.39 192.168.1.66 +hosts allow = 192.168.1.59 10.16.163.39 192.168.1.66 [people-repos] comment = repos.fedorapeople.org content diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 0e4514daf8..30b34c520a 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -12,7 +12,7 @@ path = /var/log uid = root gid = root read only = yes -hosts allow = 10.3.163.39 192.168.1.59 10.16.163.39 192.168.1.66 +hosts allow = 192.168.1.59 10.16.163.39 192.168.1.66 [docs] comment = Docs Site @@ -20,7 +20,7 @@ path = /srv/docs uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [review-stats] comment = Package Review Stats @@ -28,7 +28,7 @@ path = /srv/web/review-stats uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [gather-easyfix] comment = Gather easyfix available in Fedora @@ -36,7 +36,7 @@ path = /srv/web/easyfix uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fedoraproject.org] comment = fedoraproject.org @@ -44,7 +44,7 @@ path = /srv/web/fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [talk.fedoraproject.org] comment = talk.fedoraproject.org @@ -52,7 +52,7 @@ path = /srv/web/talk.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [start.fedoraproject.org] comment = start.fedoraproject.org @@ -60,7 +60,7 @@ path = /srv/websites/start.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [mirrors.fedoraproject.org] comment = mirrors.fedoraproject.org @@ -68,7 +68,7 @@ path = /srv/web/mirrors.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fedoracommunity.org] comment = fedoracommunity.org @@ -76,7 +76,7 @@ path = /srv/websites/fedoracommunity.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [flocktofedora.org] comment = flocktofedora.org @@ -84,7 +84,7 @@ path = /srv/websites/flocktofedora.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [getfedora.org] comment = getfedora.org @@ -92,7 +92,7 @@ path = /srv/websites/getfedora.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [labs.fedoraproject.org] comment = labs.fedoraproject.org @@ -100,7 +100,7 @@ path = /srv/websites/labs.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [budget.fedoraproject.org] comment = budget.fedoraproject.org @@ -108,7 +108,7 @@ path = /srv/web/budget.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [iot.fedoraproject.org] comment = iot.fedoraproject.org @@ -116,7 +116,7 @@ path = /srv/web/iot.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [developer.fedoraproject.org] comment = developer.fedoraproject.org @@ -124,7 +124,7 @@ path = /srv/web/developer.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [codecs.fedoraproject.org] comment = codecs.fedoraproject.org @@ -132,7 +132,7 @@ path = /srv/web/codecs.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [alt.fedoraproject.org] comment = alt.fedoraproject.org @@ -140,7 +140,7 @@ path = /srv/websites/alt.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fmw] comment = fmw @@ -148,7 +148,7 @@ path = /srv/web/fmw uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [registry-signatures] comment = registry-signatures @@ -156,7 +156,7 @@ path = /srv/web/registry-signatures uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [flatpak-index] comment = flatpak-indexer output @@ -164,7 +164,7 @@ path = /srv/web/registry-index uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [docs-redirects] comment = Docs Site Redirects @@ -172,7 +172,7 @@ path = /srv/web/docs-redirects uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fedoraloveskde.org] comment = fedoraloveskde.org @@ -180,4 +180,4 @@ path = /srv/web/fedoraloveskde.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index d36ad01961..f95905f82f 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -12,7 +12,7 @@ path = /var/log uid = root gid = root read only = yes -hosts allow = 10.3.163.39 192.168.1.59 10.16.163.39 +hosts allow = 192.168.1.59 10.16.163.39 [docs] comment = Docs Site @@ -20,7 +20,7 @@ path = /srv/docs uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [review-stats] comment = Package Review Stats @@ -28,7 +28,7 @@ path = /srv/web/review-stats uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [gather-easyfix] comment = Gather easyfix available in Fedora @@ -36,7 +36,7 @@ path = /srv/web/easyfix uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fedoraproject.org] comment = fedoraproject.org @@ -44,7 +44,7 @@ path = /srv/web/fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [talk.fedoraproject.org] comment = talk.fedoraproject.org @@ -52,7 +52,7 @@ path = /srv/web/talk.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [start.fedoraproject.org] comment = start.fedoraproject.org @@ -60,7 +60,7 @@ path = /srv/websites/start.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [mirrors.fedoraproject.org] comment = mirrors.fedoraproject.org @@ -68,7 +68,7 @@ path = /srv/web/mirrors.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fedoracommunity.org] comment = fedoracommunity.org @@ -76,7 +76,7 @@ path = /srv/websites/fedoracommunity.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [flocktofedora.org] comment = flocktofedora.org @@ -84,7 +84,7 @@ path = /srv/websites/flocktofedora.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [getfedora.org] comment = getfedora.org @@ -92,7 +92,7 @@ path = /srv/websites/getfedora.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [labs.fedoraproject.org] comment = labs.fedoraproject.org @@ -100,7 +100,7 @@ path = /srv/websites/labs.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [budget.fedoraproject.org] comment = budget.fedoraproject.org @@ -108,7 +108,7 @@ path = /srv/web/budget.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [iot.fedoraproject.org] comment = iot.fedoraproject.org @@ -116,7 +116,7 @@ path = /srv/web/iot.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [developer.fedoraproject.org] comment = developer.fedoraproject.org @@ -124,7 +124,7 @@ path = /srv/web/developer.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [codecs.fedoraproject.org] comment = codecs.fedoraproject.org @@ -132,7 +132,7 @@ path = /srv/web/codecs.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [alt.fedoraproject.org] comment = alt.fedoraproject.org @@ -140,7 +140,7 @@ path = /srv/websites/alt.fedoraproject.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fmw] comment = fmw @@ -148,7 +148,7 @@ path = /srv/web/fmw uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [registry-signatures] comment = registry-signatures @@ -156,7 +156,7 @@ path = /srv/web/registry-signatures uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [flatpak-index] comment = flatpak-indexer output @@ -164,7 +164,7 @@ path = /srv/web/registry-index uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [docs-redirects] comment = Docs Site Redirects @@ -172,7 +172,7 @@ path = /srv/web/docs-redirects uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 [fedoraloveskde.org] comment = fedoraloveskde.org @@ -180,4 +180,4 @@ path = /srv/web/fedoraloveskde.org uid = root gid = root read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 +hosts allow = 192.168.0.0/255.255.0.0 10.16.160.0/255.255.224.0 diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index fcfe9438f1..22d8e6d699 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -153,7 +153,7 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} -{% if datacenter == 'iad2' or datacenter == 'rdu3' %} +{% if datacenter == 'rdu3' %} [fedora-compose0] comment = Fedora composes path = /mnt/koji/compose @@ -191,5 +191,5 @@ refuse options = checksum uid = root gid = root read only = yes - hosts allow = 10.3.163.39 192.168.1.59 10.16.163.39 + hosts allow = 192.168.1.59 10.16.163.39 list = no diff --git a/roles/sigul/bridge/templates/bridge.conf.j2 b/roles/sigul/bridge/templates/bridge.conf.j2 index 6bea72538a..06832b4af9 100644 --- a/roles/sigul/bridge/templates/bridge.conf.j2 +++ b/roles/sigul/bridge/templates/bridge.conf.j2 @@ -2,7 +2,7 @@ # [bridge] # Nickname of the bridge's certificate in the NSS database specified below -bridge-cert-nickname: sign-bridge{{ env_suffix }}.iad2.fedoraproject.org +bridge-cert-nickname: sign-bridge{{ env_suffix }}.rdu3.fedoraproject.org # Maximum accepted total size of all RPM payloads stored on disk for one request max-rpms-payload-size: 70737418240 diff --git a/roles/sigul/server/templates/server.conf.j2 b/roles/sigul/server/templates/server.conf.j2 index 23c36b2a13..d505ab285b 100644 --- a/roles/sigul/server/templates/server.conf.j2 +++ b/roles/sigul/server/templates/server.conf.j2 @@ -6,9 +6,9 @@ {% if env == "production" %} bridge-hostname: sign-bridge.{{datacenter}}.fedoraproject.org {% else %} -bridge-hostname: sign-bridge01.stg.iad2.fedoraproject.org +bridge-hostname: sign-bridge01.stg.rdu3.fedoraproject.org {% endif %} -server-cert-nickname: sign-vault{{ env_suffix }}.iad2.fedoraproject.org +server-cert-nickname: sign-vault{{ env_suffix }}.rdu3.fedoraproject.org # Port on which the bridge expects server connections bridge-port: 44333 @@ -68,7 +68,7 @@ pkcs11_yubikey_sv03_privkey: pkcs11:serial=8f2a341e00d7a665;id=%03;type=private pkcs11_yubikey_sv04_privkey: pkcs11:serial=b38ee13e56b3b987;id=%03;type=private {% elif inventory_hostname.startswith('sign-vault05') %} pkcs11_yubikey_sv05_privkey: pkcs11:serial=e8dae68ae187ff13;id=%03;type=private -{% elif inventory_hostname.startswith('sign-vault06') or inventory_hostname == "sign-vault01.iad2.fedoraproject.org" %} +{% elif inventory_hostname.startswith('sign-vault06') or inventory_hostname == "sign-vault01.rdu3.fedoraproject.org" %} pkcs11_yubikey_sv06_privkey: pkcs11:serial=e3c4804a6631dd5f;id=%03;type=private {% endif %} {% endif %} diff --git a/roles/supybot/files/ursabot.service b/roles/supybot/files/ursabot.service index 4b58168094..2beca268e2 100644 --- a/roles/supybot/files/ursabot.service +++ b/roles/supybot/files/ursabot.service @@ -4,7 +4,7 @@ After=network.target [Service] Environment=FEDORA_MESSAGING_CONF=/etc/fedora-messaging/ursabot.toml -Environment=KRB5_CLIENT_KTNAME=/etc/krb5.ursabot_value02.stg.iad2.fedoraproject.org.keytab +Environment=KRB5_CLIENT_KTNAME=/etc/krb5.ursabot_value02.stg.rdu3.fedoraproject.org.keytab Type=simple User=daemon Group=daemon diff --git a/roles/supybot/files/zodbot.service b/roles/supybot/files/zodbot.service index 3e41fd4f46..957d01b96b 100644 --- a/roles/supybot/files/zodbot.service +++ b/roles/supybot/files/zodbot.service @@ -4,7 +4,7 @@ After=network.target [Service] Environment=FEDORA_MESSAGING_CONF=/etc/fedora-messaging/zodbot.toml -Environment=KRB5_CLIENT_KTNAME=/etc/krb5.zodbot_value02.iad2.fedoraproject.org.keytab +Environment=KRB5_CLIENT_KTNAME=/etc/krb5.zodbot_value02.rdu3.fedoraproject.org.keytab Type=simple User=daemon Group=daemon diff --git a/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org b/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org index ea5974fc0b..f10ecbcdd3 100644 --- a/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org +++ b/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org @@ -13,16 +13,16 @@ LABEL local LABEL cloud-fx MENU LABEL cloud-fx KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-7-cloud-fx net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.32.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.32.16/repo/rhel/ks/hardware-rhel-7-cloud-fx net.ifnames=0 biosdevname=0 LABEL EL-8-nohd-ppc64le MENU LABEL el8nohdppc64le KERNEL images/RHEL/8/ppc64le/vmlinuz - APPEND initrd=images/RHEL/8/ppx64le/initrd.img method=http://38.145.60.16/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-8-nohd-ppc64le net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/8/ppx64le/initrd.img method=http://38.145.32.16/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://38.145.32.16/repo/rhel/ks/hardware-rhel-8-nohd-ppc64le net.ifnames=0 biosdevname=0 LABEL EL-8-10hd-x86_64 MENU LABEL el810hdx86 KERNEL images/RHEL/8/x86_64/vmlinuz - APPEND initrd=images/RHEL/8/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL8-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-8-x86_64-10disk-ext net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/8/x86_64/initrd.img method=http://38.145.32.16/repo/rhel/RHEL8-x86_64/ ip=dhcp ks=http://38.145.32.16/repo/rhel/ks/hardware-rhel-8-x86_64-10disk-ext net.ifnames=0 biosdevname=0 MENU end diff --git a/roles/tftp_server/files/default.noc-cc01.rdu-cc.fedoraproject.org b/roles/tftp_server/files/default.noc-cc01.rdu-cc.fedoraproject.org index ea5974fc0b..f10ecbcdd3 100644 --- a/roles/tftp_server/files/default.noc-cc01.rdu-cc.fedoraproject.org +++ b/roles/tftp_server/files/default.noc-cc01.rdu-cc.fedoraproject.org @@ -13,16 +13,16 @@ LABEL local LABEL cloud-fx MENU LABEL cloud-fx KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-7-cloud-fx net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.32.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.32.16/repo/rhel/ks/hardware-rhel-7-cloud-fx net.ifnames=0 biosdevname=0 LABEL EL-8-nohd-ppc64le MENU LABEL el8nohdppc64le KERNEL images/RHEL/8/ppc64le/vmlinuz - APPEND initrd=images/RHEL/8/ppx64le/initrd.img method=http://38.145.60.16/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-8-nohd-ppc64le net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/8/ppx64le/initrd.img method=http://38.145.32.16/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://38.145.32.16/repo/rhel/ks/hardware-rhel-8-nohd-ppc64le net.ifnames=0 biosdevname=0 LABEL EL-8-10hd-x86_64 MENU LABEL el810hdx86 KERNEL images/RHEL/8/x86_64/vmlinuz - APPEND initrd=images/RHEL/8/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL8-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-8-x86_64-10disk-ext net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/8/x86_64/initrd.img method=http://38.145.32.16/repo/rhel/RHEL8-x86_64/ ip=dhcp ks=http://38.145.32.16/repo/rhel/ks/hardware-rhel-8-x86_64-10disk-ext net.ifnames=0 biosdevname=0 MENU end diff --git a/roles/tftp_server/files/default.noc01.iad2.fedoraproject.org b/roles/tftp_server/files/default.noc01.iad2.fedoraproject.org deleted file mode 100644 index a88bdd89e0..0000000000 --- a/roles/tftp_server/files/default.noc01.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ -default vesamenu.c32 -prompt 1 -timeout 600 - -display boot.msg - -label linux-x86 - menu label ^Install system x86_64 - menu default - kernel images/RHEL/8.5/x86_64/vmlinuz - append initrd=images/RHEL/8.5/x86_64/initrd.img ip=dhcp inst.repo=http://10.3.163.35/repo/RHEL/8.2/x86_64/ -label linux-a64 - menu label ^Install system aarch64 - menu default - kernel images/RHEL/8.5/aarch64/vmlinuz - append initrd=images/RHEL/8.5/aarch64/initrd.img ip=dhcp inst.repo=http://10.3.163.35/repo/rhel/RHEL/8.2/aarch64/ -label linux-ppc64le-p09 - menu label ^Install system fedora ppc64le p09 - menu default - kernel images/Fedora/40/ppc64le/vmlinuz - append initrd=http://10.3.163.35/infra/bigfiles/tftpboot/images/Fedora/40/ppc64le/initrd.img ip=dhcp inst.ks=http://10.3.163.35/repo/rhel/ks/hardware-fedora-40-ppc64le-08disk inst.repo=http://10.3.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os nameserver=10.3.163.33 console=tty0 console=ttyS0,115200 console=ttyS1,115200 net.ifnames=0 -label openqa-worker-08disk ppc64le - menu label ^Install openqa system fedora ppc64le p09 - menu default - kernel images/Fedora/40/ppc64le/vmlinuz - append initrd=images/Fedora/40/ppc64le/initrd.img ip=dhcp inst.ks=http://10.3.163.35/repo/rhel/ks/openqa-worker-fedora-08disk inst.repo=http://10.3.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os -label vesa - menu label Install system with ^basic video driver - kernel images/RHEL/8.5/x86_64/vmlinuz - append initrd=images/RHEL/8.5/x86_64/initrd.img ip=dhcp inst.xdriver=vesa nomodeset inst.repo=http://10.3.163.35/repo/RHEL/8.2/x86_64/ -label rescue - menu label ^Rescue installed x86_64 system - kernel images/RHEL/8.5/x86_64/vmlinuz - append initrd=images/RHEL/8.5/x86_64/initrd.img rescue -label local - menu label Boot from ^local drive - localboot 0xffff diff --git a/roles/tftp_server/files/default.noc01.rdu3.fedoraproject.org b/roles/tftp_server/files/default.noc01.rdu3.fedoraproject.org index a88bdd89e0..3b5573218c 100644 --- a/roles/tftp_server/files/default.noc01.rdu3.fedoraproject.org +++ b/roles/tftp_server/files/default.noc01.rdu3.fedoraproject.org @@ -8,26 +8,26 @@ label linux-x86 menu label ^Install system x86_64 menu default kernel images/RHEL/8.5/x86_64/vmlinuz - append initrd=images/RHEL/8.5/x86_64/initrd.img ip=dhcp inst.repo=http://10.3.163.35/repo/RHEL/8.2/x86_64/ + append initrd=images/RHEL/8.5/x86_64/initrd.img ip=dhcp inst.repo=http://10.16.163.35/repo/RHEL/8.2/x86_64/ label linux-a64 menu label ^Install system aarch64 menu default kernel images/RHEL/8.5/aarch64/vmlinuz - append initrd=images/RHEL/8.5/aarch64/initrd.img ip=dhcp inst.repo=http://10.3.163.35/repo/rhel/RHEL/8.2/aarch64/ + append initrd=images/RHEL/8.5/aarch64/initrd.img ip=dhcp inst.repo=http://10.16.163.35/repo/rhel/RHEL/8.2/aarch64/ label linux-ppc64le-p09 menu label ^Install system fedora ppc64le p09 menu default kernel images/Fedora/40/ppc64le/vmlinuz - append initrd=http://10.3.163.35/infra/bigfiles/tftpboot/images/Fedora/40/ppc64le/initrd.img ip=dhcp inst.ks=http://10.3.163.35/repo/rhel/ks/hardware-fedora-40-ppc64le-08disk inst.repo=http://10.3.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os nameserver=10.3.163.33 console=tty0 console=ttyS0,115200 console=ttyS1,115200 net.ifnames=0 + append initrd=http://10.16.163.35/infra/bigfiles/tftpboot/images/Fedora/40/ppc64le/initrd.img ip=dhcp inst.ks=http://10.16.163.35/repo/rhel/ks/hardware-fedora-40-ppc64le-08disk inst.repo=http://10.16.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os nameserver=10.16.163.33 console=tty0 console=ttyS0,115200 console=ttyS1,115200 net.ifnames=0 label openqa-worker-08disk ppc64le menu label ^Install openqa system fedora ppc64le p09 menu default kernel images/Fedora/40/ppc64le/vmlinuz - append initrd=images/Fedora/40/ppc64le/initrd.img ip=dhcp inst.ks=http://10.3.163.35/repo/rhel/ks/openqa-worker-fedora-08disk inst.repo=http://10.3.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os + append initrd=images/Fedora/40/ppc64le/initrd.img ip=dhcp inst.ks=http://10.16.163.35/repo/rhel/ks/openqa-worker-fedora-08disk inst.repo=http://10.16.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os label vesa menu label Install system with ^basic video driver kernel images/RHEL/8.5/x86_64/vmlinuz - append initrd=images/RHEL/8.5/x86_64/initrd.img ip=dhcp inst.xdriver=vesa nomodeset inst.repo=http://10.3.163.35/repo/RHEL/8.2/x86_64/ + append initrd=images/RHEL/8.5/x86_64/initrd.img ip=dhcp inst.xdriver=vesa nomodeset inst.repo=http://10.16.163.35/repo/RHEL/8.2/x86_64/ label rescue menu label ^Rescue installed x86_64 system kernel images/RHEL/8.5/x86_64/vmlinuz diff --git a/roles/tftp_server/tasks/main.yml b/roles/tftp_server/tasks/main.yml index 8467bfa78f..7a5997dc09 100644 --- a/roles/tftp_server/tasks/main.yml +++ b/roles/tftp_server/tasks/main.yml @@ -22,7 +22,7 @@ tags: - config - tftp_server - when: datacenter != 'iad2' + when: datacenter != 'rdu3' - name: Enable tftp socket service service: state=started enabled=true name=tftp.socket @@ -42,7 +42,7 @@ mode: '0755' tags: - tftp_server - when: datacenter == 'iad2' + when: datacenter == 'rdu3' - name: Copy rhcos files to images folder ansible.builtin.copy: @@ -51,7 +51,7 @@ remote_src: yes tags: - tftp_server - when: datacenter == 'iad2' + when: datacenter == 'rdu3' # - name: Generate custom configs # ansible.builtin.template: src=grubhost.cfg.j2 dest="/var/lib/tftpboot/uefi/{{ hostvars[item].install_mac }}" diff --git a/roles/varnish/templates/proxies.vcl.j2 b/roles/varnish/templates/proxies.vcl.j2 index 8a9674f762..fe5837fcdf 100644 --- a/roles/varnish/templates/proxies.vcl.j2 +++ b/roles/varnish/templates/proxies.vcl.j2 @@ -86,10 +86,10 @@ backend registry { acl purge { "192.168.1.129"; // wiki01.vpn "192.168.1.130"; // wiki02.vpn - "10.3.166.83"; // wiki01.stg - "10.3.163.83"; // wiki01 - "10.3.163.102"; // wiki02 - "10.3.163.35"; // batcave01 + "10.16.166.83"; // wiki01.stg + "10.16.163.83"; // wiki01 + "10.16.163.102"; // wiki02 + "10.16.163.35"; // batcave01 "192.168.1.58"; // batcave01.vpn } diff --git a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 index aa4b437577..c824bd4a9e 100644 --- a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 +++ b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 @@ -1,6 +1,6 @@ --- synced_hosts: - - proxy01.iad2.fedoraproject.org + - proxy01.rdu3.fedoraproject.org - proxy02.vpn.fedoraproject.org - proxy03.vpn.fedoraproject.org - proxy04.vpn.fedoraproject.org @@ -8,7 +8,7 @@ synced_hosts: - proxy06.vpn.fedoraproject.org - proxy09.vpn.fedoraproject.org - proxy09.vpn.fedoraproject.org - - proxy10.iad2.fedoraproject.org + - proxy10.rdu3.fedoraproject.org - proxy11.vpn.fedoraproject.org - proxy12.vpn.fedoraproject.org - proxy14.vpn.fedoraproject.org @@ -23,31 +23,31 @@ synced_hosts: - proxy38.vpn.fedoraproject.org - proxy39.vpn.fedoraproject.org - proxy40.vpn.fedoraproject.org - - proxy101.iad2.fedoraproject.org - - proxy110.iad2.fedoraproject.org - # - proxy01.stg.iad2.fedoraproject.org - # - datagrepper01.iad2.fedoraproject.org - # - datagrepper02.iad2.fedoraproject.org - # - datagrepper01.stg.iad2.fedoraproject.org - # - badges-web01.iad2.fedoraproject.org - # - badges-web02.iad2.fedoraproject.org - # - badges-web01.stg.iad2.fedoraproject.org - # - packages03.iad2.fedoraproject.org - # - packages04.iad2.fedoraproject.org - # - packages03.stg.iad2.fedoraproject.org - # - blockerbugs01.iad2.fedoraproject.org - # - blockerbugs02.iad2.fedoraproject.org - # - blockerbugs01.stg.iad2.fedoraproject.org - - value02.iad2.fedoraproject.org + - proxy101.rdu3.fedoraproject.org + - proxy110.rdu3.fedoraproject.org + # - proxy01.stg.rdu3.fedoraproject.org + # - datagrepper01.rdu3.fedoraproject.org + # - datagrepper02.rdu3.fedoraproject.org + # - datagrepper01.stg.rdu3.fedoraproject.org + # - badges-web01.rdu3.fedoraproject.org + # - badges-web02.rdu3.fedoraproject.org + # - badges-web01.stg.rdu3.fedoraproject.org + # - packages03.rdu3.fedoraproject.org + # - packages04.rdu3.fedoraproject.org + # - packages03.stg.rdu3.fedoraproject.org + # - blockerbugs01.rdu3.fedoraproject.org + # - blockerbugs02.rdu3.fedoraproject.org + # - blockerbugs01.stg.rdu3.fedoraproject.org + - value02.rdu3.fedoraproject.org - people01.vpn.fedoraproject.org - - noc01.iad2.fedoraproject.org - - dl01.iad2.fedoraproject.org - - dl02.iad2.fedoraproject.org - - dl03.iad2.fedoraproject.org - - dl04.iad2.fedoraproject.org - - dl05.iad2.fedoraproject.org + - noc01.rdu3.fedoraproject.org + - dl01.rdu3.fedoraproject.org + - dl02.rdu3.fedoraproject.org + - dl03.rdu3.fedoraproject.org + - dl04.rdu3.fedoraproject.org + - dl05.rdu3.fedoraproject.org - download-ib01.vpn.fedoraproject.org # - download-cc-rdu01.vpn.fedoraproject.org - - sundries01.iad2.fedoraproject.org - # - sundries02.iad2.fedoraproject.org - # - sundries01.stg.iad2.fedoraproject.org + - sundries01.rdu3.fedoraproject.org + # - sundries02.rdu3.fedoraproject.org + # - sundries01.stg.rdu3.fedoraproject.org diff --git a/scripts/drac-xml-writer/dhcp_parser.py b/scripts/drac-xml-writer/dhcp_parser.py index b1061ad764..62b2468d02 100755 --- a/scripts/drac-xml-writer/dhcp_parser.py +++ b/scripts/drac-xml-writer/dhcp_parser.py @@ -5,7 +5,7 @@ import pandas as pd # File paths ips_csv = './hostnames.csv' -dhcp_data = '/srv/web/infra/ansible/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org' +dhcp_data = '/srv/web/infra/ansible/roles/dhcp_server/files/dhcpd.conf.noc01.rdu3.fedoraproject.org' # Read the CSV ips = pd.read_csv(ips_csv) diff --git a/scripts/public-db-copy b/scripts/public-db-copy index b3aff17cc2..3555088947 100755 --- a/scripts/public-db-copy +++ b/scripts/public-db-copy @@ -7,7 +7,6 @@ # This changes really often ;) bkup_domain=rdu3.fedoraproject.org -bkup_domain=iad2.fedoraproject.org scp db-datanommer02.${bkup_domain}:/backups/datanommer2-$(date +%F).dump.xz \ /srv/web/infra/db-dumps/datanommer2.dump.xz