From 0167d3214a96eb3311da57f57c889ca9047791f3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 27 Mar 2015 00:30:32 +0000 Subject: [PATCH] Re-name arm01-builder02 to arm01-releng02 --- inventory/inventory | 1 + .../dhcpd.conf.noc01.phx2.fedoraproject.org | 4 ++-- .../files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/servers.cfg | 2 +- .../files/nagios/hosts/arm01-builder02.cfg | 16 ++++++++-------- .../files/nagios/hosts/arm01-releng02.cfg | 8 ++++++++ 6 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 roles/nagios_server/files/nagios/hosts/arm01-releng02.cfg diff --git a/inventory/inventory b/inventory/inventory index a655832fa1..37e42354cd 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -23,6 +23,7 @@ arm03-qa01.cloud.fedoraproject.org [releng-compose] arm01-releng00.arm.fedoraproject.org +arm01-releng02.arm.fedoraproject.org compose-x86-01.phx2.fedoraproject.org compose-x86-02.phx2.fedoraproject.org diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org index 68a363f04d..0ffb616135 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -381,10 +381,10 @@ subnet 10.5.79.0 netmask 255.255.255.0 { option host-name "arm01-retrace01-mgmt"; next-server 10.5.126.41; } - host arm01-builder02-mgmt { + host arm01-releng02-mgmt { hardware ethernet fc:2f:40:ea:a7:a2; fixed-address 10.5.79.12; - option host-name "arm01-builder02-mgmt"; + option host-name "arm01-releng02-mgmt"; next-server 10.5.126.41; } host arm01-builder03-mgmt { diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index 1952b78ee4..ddc28e488a 100644 --- a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg @@ -1,5 +1,5 @@ define hostgroup { hostgroup_name nomail alias No Mail - members *, !bastion01, !bastion02, !bastion-vpn, !backup03, !db02.stg, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !releng01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-coloamer01, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy09-fpo, !proxy09-wildcard, !proxy10-fpo, !proxy11-fpo, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 + members *, !bastion01, !bastion02, !bastion-vpn, !backup03, !db02.stg, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !releng01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-coloamer01, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy09-fpo, !proxy09-wildcard, !proxy10-fpo, !proxy11-fpo, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 } diff --git a/roles/nagios_server/files/nagios/hostgroups/servers.cfg b/roles/nagios_server/files/nagios/hostgroups/servers.cfg index d2e866d269..810ed7c4e7 100644 --- a/roles/nagios_server/files/nagios/hostgroups/servers.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/servers.cfg @@ -5,6 +5,6 @@ define hostgroup { hostgroup_name servers alias All Servers - members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy09-fpo,!proxy09-wildcard, !proxy10-fpo, !proxy11-fpo, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org, !virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org, !virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 + members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy09-fpo,!proxy09-wildcard, !proxy10-fpo, !proxy11-fpo, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org, !virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org, !virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 } diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder02.cfg b/roles/nagios_server/files/nagios/hosts/arm01-builder02.cfg index 85ea0a4d92..9f842bfd25 100644 --- a/roles/nagios_server/files/nagios/hosts/arm01-builder02.cfg +++ b/roles/nagios_server/files/nagios/hosts/arm01-builder02.cfg @@ -1,8 +1,8 @@ -define host { - host_name arm01-builder02 - alias arm01-builder02.arm.fedoraproject.org - use defaultbuilders - check_command check-host-alive - address arm01-builder02.arm.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# host_name arm01-builder02 +# alias arm01-builder02.arm.fedoraproject.org +# use defaultbuilders +# check_command check-host-alive +# address arm01-builder02.arm.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/arm01-releng02.cfg b/roles/nagios_server/files/nagios/hosts/arm01-releng02.cfg new file mode 100644 index 0000000000..ac106962ef --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/arm01-releng02.cfg @@ -0,0 +1,8 @@ +define host { + host_name arm01-releng02 + alias arm01-releng02.arm.fedoraproject.org + use defaultbuilders + check_command check-host-alive + address arm01-releng02.arm.fedoraproject.org + contact_groups build-sysadmin-email +}