diff --git a/backups/inventory b/backups/inventory index 8167e5aa53..2cb55a6a0d 100644 --- a/backups/inventory +++ b/backups/inventory @@ -13,3 +13,4 @@ pkgs01.phx2.fedoraproject.org log01.phx2.fedoraproject.org qadevel.cloud.fedoraproject.org db-qa01.qa.fedoraproject.org +db-koji01.phx2.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 17b16e725f..2981de79c6 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -210,7 +210,6 @@ darkserver01.phx2.fedoraproject.org [dbserver] db01.phx2.fedoraproject.org -db04.phx2.fedoraproject.org db05.phx2.fedoraproject.org db-fas01.phx2.fedoraproject.org db-datanommer02.phx2.fedoraproject.org diff --git a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts index cc6fa1c424..baca119da4 100644 --- a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts @@ -11,7 +11,7 @@ 10.5.125.119 nfs01.phx2.fedoraproject.org nfs01 nfs1 10.5.126.92 noc01.phx2.fedoraproject.org noc1 noc01 10.5.126.82 app02.phx2.fedoraproject.org app2 app4 app02 app04 -10.5.126.85 db02.stg.phx2.fedoraproject.org db01 db04 db05 db1 db2 db3 +10.5.126.85 db02.stg.phx2.fedoraproject.org db01 db05 db-koji01 10.5.126.23 lockbox01.phx2.fedoraproject.org infrastructure.fedoraproject.org 10.5.125.63 koji.fedoraproject.org koji.stg.fedoraproject.org koji1 koji01 s390.koji.fedoraproject.org sparc.koji.fedoraproject.org arm.koji.fedoraproject.org ppc.koji.fedoraproject.org 10.5.126.27 archives.fedoraproject.org diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts index 476ed89c12..1f3eb3800e 100644 --- a/roles/hosts/files/staging-hosts +++ b/roles/hosts/files/staging-hosts @@ -5,6 +5,6 @@ 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org db01 db04 db05 db-ask db-datanommer db-datanommer01 db-datanommer02 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db +10.5.126.85 db02.stg.fedoraproject.org db01 db-koji01 db05 db-ask db-datanommer db-datanommer01 db-datanommer02 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db 10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index bd0e8d6647..ac86451137 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -3,7 +3,7 @@ ## Basic options ## DBName = koji DBUser = koji -DBHost = db04 +DBHost = db-koji01 DBPass = {{ kojiPassword }} KojiDir = /mnt/koji diff --git a/roles/nagios_server/files/nagios/hosts/db-koji01.cfg b/roles/nagios_server/files/nagios/hosts/db-koji01.cfg new file mode 100644 index 0000000000..346d353eee --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/db-koji01.cfg @@ -0,0 +1,7 @@ +define host { + host_name db-koji01 + alias db-koji01.phx2.fedoraproject.org + use defaulttemplate + address db-koji01.phx2.fedoraproject.org + parents bvirthost09 +} diff --git a/roles/nagios_server/files/nagios/hosts/db04.cfg b/roles/nagios_server/files/nagios/hosts/db04.cfg index 0bc9ded4d4..cf2ea85446 100644 --- a/roles/nagios_server/files/nagios/hosts/db04.cfg +++ b/roles/nagios_server/files/nagios/hosts/db04.cfg @@ -1,7 +1,7 @@ -define host { - host_name db04 - alias db04.phx2.fedoraproject.org - use defaulttemplate - address db04.phx2.fedoraproject.org - parents bvirthost11 -} +#define host { +# host_name db04 +# alias db04.phx2.fedoraproject.org +# use defaulttemplate +# address db04.phx2.fedoraproject.org +# parents bvirthost11 +#} diff --git a/roles/nagios_server/files/nagios/services/db_backups.cfg b/roles/nagios_server/files/nagios/services/db_backups.cfg index 583faf2e62..0915bb256c 100644 --- a/roles/nagios_server/files/nagios/services/db_backups.cfg +++ b/roles/nagios_server/files/nagios/services/db_backups.cfg @@ -1,19 +1,19 @@ define service { - host_name db05, db04 + host_name db05 service_description Check MySQL Backup check_command check_by_nrpe!check_mysql_backup use defaulttemplate } define service { - host_name db05, db04 + host_name db05 service_description Check Koji PGSQL Backup check_command check_by_nrpe!check_pgsql_koji_backup use defaulttemplate } define service { - host_name db05, db04, db01 + host_name db05, db01 service_description Check PGSQL Backup check_command check_by_nrpe!check_pgsql_backup use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/pgsql.cfg b/roles/nagios_server/files/nagios/services/pgsql.cfg index 2082f3a892..b442e9ffbc 100644 --- a/roles/nagios_server/files/nagios/services/pgsql.cfg +++ b/roles/nagios_server/files/nagios/services/pgsql.cfg @@ -1,5 +1,5 @@ define service { - host_name db04 + host_name db-koji01 service_description Check Koji DB check_command check_pgsql!koji use criticaltemplate