From 12c486cda33e4a14ba3e1493a1931c9affda3873 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sun, 14 Jun 2020 19:51:22 -0400 Subject: [PATCH] remove some hosts in inventory file which do not exist in IAD2. --- inventory/backups | 8 ++++---- inventory/host_vars/db-koji01.iad2.fedoraproject.org | 4 ++-- inventory/inventory | 7 ++----- .../files/nagios/services/iad2_internal/fedmsg.cfg | 2 +- roles/postgresql_server/tasks/main.yml | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/inventory/backups b/inventory/backups index 2e419f4901..c1e8d91181 100644 --- a/inventory/backups +++ b/inventory/backups @@ -6,15 +6,15 @@ copr-fe.aws.fedoraproject.org copr-keygen.aws.fedoraproject.org db01.iad2.fedoraproject.org db03.iad2.fedoraproject.org -db-datanommer02.iad2.fedoraproject.org +db-datanommer01.iad2.fedoraproject.org db-fas01.iad2.fedoraproject.org batcave01.iad2.fedoraproject.org pagure01.fedoraproject.org people02.fedoraproject.org pkgs01.iad2.fedoraproject.org log01.iad2.fedoraproject.org -db-qa01.iad2.fedoraproject.org -db-koji02.iad2.fedoraproject.org +db-openqa01.iad2.fedoraproject.org +db-koji01.iad2.fedoraproject.org value01.iad2.fedoraproject.org tang01.iad2.fedoraproject.org -nuancier01.iad2.fedoraproject.org +#nuancier01.iad2.fedoraproject.org diff --git a/inventory/host_vars/db-koji01.iad2.fedoraproject.org b/inventory/host_vars/db-koji01.iad2.fedoraproject.org index ee19ba302d..37826a9614 100644 --- a/inventory/host_vars/db-koji01.iad2.fedoraproject.org +++ b/inventory/host_vars/db-koji01.iad2.fedoraproject.org @@ -42,7 +42,7 @@ custom_rules: [ nrpe_procs_warn: 600 nrpe_procs_crit: 700 -# we backup the backup on db-koji02 now -#db_backup_dir: ['/backups'] +# we backup the backup on db-koji01 until we can replace now +db_backup_dir: ['/backups'] shared_buffers: "15GB" effective_cache_size: "45GB" diff --git a/inventory/inventory b/inventory/inventory index b49b825677..208085377d 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -652,12 +652,11 @@ retrace-stg.aws.fedoraproject.org [staging_friendly] batcave01.iad2.fedoraproject.org bastion01.iad2.fedoraproject.org -bastion02.iad2.fedoraproject.org certgetter01.iad2.fedoraproject.org log01.iad2.fedoraproject.org ns01.iad2.fedoraproject.org ns02.iad2.fedoraproject.org -db-qa01.iad2.fedoraproject.org +db-openqa01.iad2.fedoraproject.org proxy01.iad2.fedoraproject.org proxy10.iad2.fedoraproject.org proxy101.iad2.fedoraproject.org @@ -1060,7 +1059,7 @@ fas [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 -pkgs02.iad2.fedoraproject.org +pkgs01.iad2.fedoraproject.org batcave01.iad2.fedoraproject.org # bodhi-backend01 gets zombies right at the end of pushes bodhi-backend01.iad2.fedoraproject.org @@ -1101,7 +1100,6 @@ autosign01.iad2.fedoraproject.org backup01.iad2.fedoraproject.org badges-backend01.iad2.fedoraproject.org badges-web01.iad2.fedoraproject.org -badges-web02.iad2.fedoraproject.org bastion01.iad2.fedoraproject.org batcave01.iad2.fedoraproject.org bkernel01.iad2.fedoraproject.org @@ -1264,7 +1262,6 @@ mm-frontend01.iad2.fedoraproject.org noc01.iad2.fedoraproject.org notifs-backend01.iad2.fedoraproject.org notifs-web01.iad2.fedoraproject.org -notifs-web02.iad2.fedoraproject.org ns01.iad2.fedoraproject.org ns02.iad2.fedoraproject.org oci-candidate-registry01.iad2.fedoraproject.org diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg index 5000f12e35..9a877efaed 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg @@ -67,7 +67,7 @@ define service { } define service { - host_name pkgs02.iad2.fedoraproject.org + host_name pkgs01.iad2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index 048d55df33..4893645b32 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -122,7 +122,7 @@ - postgresql - name: Copy over backup scriplet - copy: src=backup-database.db-koji02 dest=/usr/local/bin/backup-database mode=0755 + copy: src=backup-database.db-koji01 dest=/usr/local/bin/backup-database mode=0755 when: inventory_hostname.startswith('db-koji01.iad2') tags: - postgresql