From b2169edd74247ee2c64eb9948f81aa38be23e351 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 11 Jun 2020 08:36:46 -0700 Subject: [PATCH] openqa vars, inventory: drop most phx2 bits This pretty much nukes all inventory entries and variables relating to the old phx2 openQA deployments, as I don't think they're ever coming up again. I left a few group entries around for now just in case they're necessary for decommissioning. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa | 2 +- inventory/group_vars/openqa_common | 5 +- inventory/group_vars/openqa_iad | 2 - inventory/group_vars/openqa_iad2 | 30 ---------- inventory/group_vars/openqa_phx | 1 - inventory/group_vars/openqa_stg_workers | 2 +- inventory/group_vars/openqa_workers | 2 +- ...openqa-x86-worker01.iad2.fedoraproject.org | 2 - .../host_vars/openqa01.iad2.fedoraproject.org | 5 -- inventory/inventory | 57 +++---------------- 10 files changed, 15 insertions(+), 93 deletions(-) delete mode 100644 inventory/group_vars/openqa_iad2 delete mode 100644 inventory/group_vars/openqa_phx diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index 7bd5d9a713..1f64eba774 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -22,7 +22,7 @@ openqa_env: production wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" openqa_wikitcms_hostname: fedoraproject.org -openqa_resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ +openqa_resultsdb_url: http://resultsdb01.iad2.fedoraproject.org/resultsdb_api/api/v2.0/ openqa_update_arches: ['x86_64'] deployment_type: prod diff --git a/inventory/group_vars/openqa_common b/inventory/group_vars/openqa_common index 569bcbf5f2..8382f8f231 100644 --- a/inventory/group_vars/openqa_common +++ b/inventory/group_vars/openqa_common @@ -3,8 +3,6 @@ # in the plays so we can change them over time and also so the plays # can be used for non-infra deployments. -# These boxes are F30+, so we need Python 3 ansible - openqa_static_uid: 601 openqa_hostname: localhost @@ -15,6 +13,9 @@ openqa_userid: http://adamwill.id.fedoraproject.org/ openqa_assetsize_updates: 100 +# stg and prod use the same database server +openqa_dbhost: db-openqa01.iad2.fedoraproject.org + # we need this for all our fedora-messaging consumers as they are not # allowed to create queues on the infra AMQP broker, by broker config openqa_amqp_passive: true diff --git a/inventory/group_vars/openqa_iad b/inventory/group_vars/openqa_iad index f24cf88d17..932ed43c82 100644 --- a/inventory/group_vars/openqa_iad +++ b/inventory/group_vars/openqa_iad @@ -1,5 +1,3 @@ -openqa_dbhost: db-openqa01.iad2.fedoraproject.org - # We don't want to do result reporting in IAD yet (until we migrate data over) openqa_amqp_resultsdb_reporter_queue: openqa_amqp_wiki_reporter_queue: diff --git a/inventory/group_vars/openqa_iad2 b/inventory/group_vars/openqa_iad2 deleted file mode 100644 index 5d3660399d..0000000000 --- a/inventory/group_vars/openqa_iad2 +++ /dev/null @@ -1,30 +0,0 @@ -# this is to enable nested virt, which we need for disk image creation -virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx" - -external_hostname: openqa.fedoraproject.org - -openqa_dbname: openqa -openqa_dbhost: db-qa03.iad2.fedoraproject.org -openqa_dbuser: openqa -openqa_dbpassword: "{{ prod_openqa_dbpassword }}" -openqa_assetsize: 500 - -openqa_key: "{{ prod_openqa_apikey }}" -openqa_secret: "{{ prod_openqa_apisecret }}" - -openqa_webapi_plugins: FedoraMessaging FedoraUpdateRestart - -# this is because openqa staging isn't really a staging host -# we don't want to set env_suffix to stg on it because that may -# break some other plays, but we do need the env suffix for the -# fedora-messaging bits, so let's make our own -openqa_env_suffix: -openqa_env: production - -wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" -openqa_wikitcms_hostname: fedoraproject.org -openqa_resultsdb_url: http://resultsdb01.iad2.fedoraproject.org/resultsdb_api/api/v2.0/ -openqa_update_arches: ['x86_64'] - -deployment_type: prod -freezes: false diff --git a/inventory/group_vars/openqa_phx b/inventory/group_vars/openqa_phx deleted file mode 100644 index 25709c32f6..0000000000 --- a/inventory/group_vars/openqa_phx +++ /dev/null @@ -1 +0,0 @@ -openqa_dbhost: db-qa03.qa.fedoraproject.org diff --git a/inventory/group_vars/openqa_stg_workers b/inventory/group_vars/openqa_stg_workers index 599a980339..8c4476cf3d 100644 --- a/inventory/group_vars/openqa_stg_workers +++ b/inventory/group_vars/openqa_stg_workers @@ -1,6 +1,6 @@ gw: 10.5.124.254 openqa_workers: 4 -openqa_hostname: openqa-stg01.qa.fedoraproject.org +openqa_hostname: openqa-stg01.iad2.fedoraproject.org openqa_key: "{{ stg_openqa_apikey }}" openqa_secret: "{{ stg_openqa_apisecret }}" diff --git a/inventory/group_vars/openqa_workers b/inventory/group_vars/openqa_workers index 040718b8e8..b28dfcb382 100644 --- a/inventory/group_vars/openqa_workers +++ b/inventory/group_vars/openqa_workers @@ -1,6 +1,6 @@ gw: 10.5.124.254 openqa_workers: 4 -openqa_hostname: openqa01.qa.fedoraproject.org +openqa_hostname: openqa01.iad2.fedoraproject.org openqa_key: "{{ prod_openqa_apikey }}" openqa_secret: "{{ prod_openqa_apisecret }}" diff --git a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org index d846a79afb..309e4b2f3f 100644 --- a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org @@ -26,8 +26,6 @@ ansible_ifcfg_disabled: ['em2', 'em3', 'em4'] # Has a hardware RNG openqa_rngd: True -# this is an IAD box, use IAD host -openqa_hostname: openqa01.iad2.fedoraproject.org # this is a powerful machine, can handle more openQA workers openqa_workers: 30 # firewall ports for server->worker websockets connections diff --git a/inventory/host_vars/openqa01.iad2.fedoraproject.org b/inventory/host_vars/openqa01.iad2.fedoraproject.org index 749d35e644..e009f6937b 100644 --- a/inventory/host_vars/openqa01.iad2.fedoraproject.org +++ b/inventory/host_vars/openqa01.iad2.fedoraproject.org @@ -30,8 +30,3 @@ num_cpus: 8 nrpe_procs_warn: 250 nrpe_procs_crit: 300 - -## FIXME -## THESE ARE ALL TEMPORARY during phx2 -> iad2 transition, should be -## changed in openqa group_vars later -openqa_resultsdb_url: http://resultsdb01.iad2.fedoraproject.org/resultsdb_api/api/v2.0/ diff --git a/inventory/inventory b/inventory/inventory index 959eb02c3a..6b2afd6ef0 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -495,14 +495,8 @@ odcs_backend # common group for variables shared between prod and stg servers [openqa_common] -openqa01.qa.fedoraproject.org -openqa-stg01.qa.fedoraproject.org openqa01.iad2.fedoraproject.org - -# variables appropriate to hosts in the old dc (phx2) but not the new one (iad2) -[openqa_phx] -openqa01.qa.fedoraproject.org -openqa-stg01.qa.fedoraproject.org +openqa-stg01.iad2.fedoraproject.org # variables appropriate to hosts in the new dc (iad2) but not the old one (phx2) [openqa_iad] @@ -510,41 +504,20 @@ openqa01.iad2.fedoraproject.org openqa-stg01.iad2.fedoraproject.org [openqa] -openqa01.qa.fedoraproject.org openqa01.iad2.fedoraproject.org [openqa_workers] -qa02.qa.fedoraproject.org -qa05.qa.fedoraproject.org -qa14.qa.fedoraproject.org openqa-x86-worker01.iad2.fedoraproject.org # openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details [openqa_stg] -openqa-stg01.qa.fedoraproject.org +openqa-stg01.iad2.fedoraproject.org [openqa_stg_workers] -qa01.qa.fedoraproject.org -qa07.qa.fedoraproject.org -qa09.qa.fedoraproject.org -openqa-ppc64le-01.qa.fedoraproject.org -openqa-ppc64le-02.qa.fedoraproject.org -openqa-ppc64le-03.qa.fedoraproject.org -aarch64-c26n1-oqa.arm.fedoraproject.org -aarch64-c27n1-oqa.arm.fedoraproject.org -aarch64-c28n1-oqa.arm.fedoraproject.org -aarch64-c29n1-oqa.arm.fedoraproject.org -aarch64-c30n1-oqa.arm.fedoraproject.org -openqa-aarch64-01.qa.fedoraproject.org -openqa-aarch64-03.qa.fedoraproject.org openqa-a64-worker01.iad2.fedoraproject.org # the workers that can run networked jobs. each server should have *one* of these per arch [openqa_tap_workers] -qa01.qa.fedoraproject.org -qa02.qa.fedoraproject.org -openqa-ppc64le-02.qa.fedoraproject.org -openqa-aarch64-01.qa.fedoraproject.org openqa-a64-worker01.iad2.fedoraproject.org openqa-x86-worker01.iad2.fedoraproject.org @@ -552,10 +525,6 @@ openqa-x86-worker01.iad2.fedoraproject.org # only one per arch per instance should be present. usually x86_64 images are created # on the server, images for other arches on a worker. [openqa_hdds_workers] -openqa-ppc64le-02.qa.fedoraproject.org -openqa-aarch64-01.qa.fedoraproject.org -qa01.qa.fedoraproject.org -qa02.qa.fedoraproject.org openqa-a64-worker01.iad2.fedoraproject.org openqa-x86-worker01.iad2.fedoraproject.org @@ -613,30 +582,26 @@ proxies_internal # proxy01.stg.phx2.fedoraproject.org [relvalconsumer_common] -openqa01.qa.fedoraproject.org openqa01.iad2.fedoraproject.org -openqa-stg01.qa.fedoraproject.org +openqa-stg01.iad2.fedoraproject.org # This group should only ever contain *ONE* system [relvalconsumer] -openqa01.qa.fedoraproject.org -#openqa01.iad2.fedoraproject.org +openqa01.iad2.fedoraproject.org [relvalconsumer_test] -openqa-stg01.qa.fedoraproject.org +openqa-stg01.iad2.fedoraproject.org [checkcompose_common] -openqa01.qa.fedoraproject.org -openqa-stg01.qa.fedoraproject.org -#openqa01.iad2.fedoraproject.org +openqa01.iad2.fedoraproject.org +openqa-stg01.iad2.fedoraproject.org # This group should only ever contain *ONE* system [checkcompose] -openqa01.qa.fedoraproject.org -#openqa01.iad2.fedoraproject.org +openqa01.iad2.fedoraproject.org [checkcompose_stg] -openqa-stg01.qa.fedoraproject.org +openqa-stg01.iad2.fedoraproject.org [resultsdb:children] resultsdb_stg @@ -863,13 +828,9 @@ zanata2fedmsg01.phx2.fedoraproject.org [fedmsg_qa_network] retrace01.qa.fedoraproject.org resultsdb01.qa.fedoraproject.org -openqa01.qa.fedoraproject.org -#openqa01.iad2.fedoraproject.org -openqa-ppc64le-01.qa.fedoraproject.org [fedmsg_qa_network_stg] resultsdb-stg01.qa.fedoraproject.org -openqa-stg01.qa.fedoraproject.org # assorted categories of fedmsg services, for convenience [fedmsg_hubs:children]