From ecd140b64dcb162c59848891e953a384ff9fdad3 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 21 Jun 2018 19:32:43 +0000 Subject: [PATCH] initial cleanup of cisco hardware --- inventory/builders | 1 - inventory/hardware | 11 --------- inventory/inventory | 6 ----- .../dhcpd.conf.dhcp01.phx2.fedoraproject.org | 23 ------------------- .../dhcpd.conf.noc01.phx2.fedoraproject.org | 22 ------------------ 5 files changed, 63 deletions(-) diff --git a/inventory/builders b/inventory/builders index bf07375374..301bd38488 100644 --- a/inventory/builders +++ b/inventory/builders @@ -127,7 +127,6 @@ buildvmhost-01.phx2.fedoraproject.org buildvmhost-02.phx2.fedoraproject.org buildvmhost-03.phx2.fedoraproject.org buildvmhost-04.phx2.fedoraproject.org -buildvmhost-12.phx2.fedoraproject.org ppc8-01.ppc.fedoraproject.org ppc8-02.ppc.fedoraproject.org ppc8-03.ppc.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index c4303159ca..64e9415059 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -86,18 +86,8 @@ cn-x86-64-02-03.cloud.fedoraproject.org #cn-x86-64-02-07.cloud.fedoraproject.org #cn-x86-64-02-08.cloud.fedoraproject.org -[ciscos] -virthost-comm02.qa.fedoraproject.org - [cisco-ucs] -buildvmhost-12.phx2.fedoraproject.org -bvirthost02.phx2.fedoraproject.org -bvirthost03.phx2.fedoraproject.org -bvirthost06.phx2.fedoraproject.org bvirthost08.phx2.fedoraproject.org -bvirthost09.phx2.fedoraproject.org -bvirthost10.phx2.fedoraproject.org -bvirthost11.phx2.fedoraproject.org [ibms] osuosl01.fedoraproject.org @@ -151,6 +141,5 @@ aarch64-c25n1.arm.fedoraproject.org moonshot powerpc dells -ciscos cisco-ucs ibms diff --git a/inventory/inventory b/inventory/inventory index 22e5ece8fb..61685b2a0f 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -127,15 +127,9 @@ bugzilla2fedmsg01.stg.phx2.fedoraproject.org [bvirthost] bvirthost01.phx2.fedoraproject.org -bvirthost02.phx2.fedoraproject.org -bvirthost03.phx2.fedoraproject.org bvirthost04.phx2.fedoraproject.org bvirthost05.phx2.fedoraproject.org -bvirthost06.phx2.fedoraproject.org bvirthost08.phx2.fedoraproject.org -bvirthost09.phx2.fedoraproject.org -bvirthost10.phx2.fedoraproject.org -bvirthost11.phx2.fedoraproject.org bvirthost12.phx2.fedoraproject.org bvirthost13.phx2.fedoraproject.org bvirthost14.phx2.fedoraproject.org diff --git a/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org index 586c903522..a65f481771 100644 --- a/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org @@ -208,29 +208,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 { filename "pxelinux.0"; } - host bvirthost03 { - hardware ethernet 00:25:B5:FF:00:01; - fixed-address 10.5.125.80; - next-server 10.5.125.43; - option host-name "bvirthost03"; - filename "pxelinux.0"; - } - - host buildvmhost-12 { - hardware ethernet 00:25:B5:FF:00:05; - fixed-address 10.5.125.134; - next-server 10.5.125.43; - option host-name "buildvmhost-12"; - filename "pxelinux.0"; - } - - host ucs-blade01 { - hardware ethernet 00:25:b5:ff:00:00; - fixed-address 10.5.125.20; - next-server 10.5.125.43; - option host-name "ucs-blade01.phx2.fedoraproject.org"; - } - host buildhw-01 { hardware ethernet 14:9E:CF:61:9E:61; fixed-address 10.5.125.164; 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 5c62b3791e..df1c6d503c 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -231,28 +231,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 { filename "pxelinux.0"; } - host buildvmhost-10 { - hardware ethernet 00:25:B5:FF:00:03; - fixed-address 10.5.125.132; - next-server 10.5.125.43; - option host-name "buildvmhost-10"; - filename "pxelinux.0"; - } - - host buildvmhost-12 { - hardware ethernet 00:25:B5:FF:00:05; - fixed-address 10.5.125.134; - next-server 10.5.125.43; - option host-name "buildvmhost-12"; - filename "pxelinux.0"; - } - - host ucs-blade01 { - hardware ethernet 00:25:b5:ff:00:00; - fixed-address 10.5.125.20; - next-server 10.5.125.43; - option host-name "ucs-blade01.phx2.fedoraproject.org"; - } host buildhw-01 { hardware ethernet 14:9E:CF:61:9E:61;