From d907461b896d4938f8ddf32d648f0f07701b527c Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 25 Jun 2018 19:07:27 +0000 Subject: [PATCH] and we have a mess of changes we need to make in ansible --- inventory/group_vars/nagios | 2 +- inventory/hardware | 2 +- .../buildvm-01.stg.phx2.fedoraproject.org | 2 +- .../buildvm-02.stg.phx2.fedoraproject.org | 2 +- .../buildvm-03.stg.phx2.fedoraproject.org | 2 +- .../buildvm-04.stg.phx2.fedoraproject.org | 2 +- .../buildvm-05.stg.phx2.fedoraproject.org | 2 +- .../koji01.stg.phx2.fedoraproject.org | 2 +- .../osbs-control01.stg.phx2.fedoraproject.org | 2 +- .../pgbdr01.stg.phx2.fedoraproject.org | 2 +- inventory/inventory | 2 +- .../dhcpd.conf.noc01.phx2.fedoraproject.org | 30 ------------------- 12 files changed, 11 insertions(+), 41 deletions(-) diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index 9bd391c983..d73a348a64 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -111,7 +111,7 @@ phx2_management_hosts: - virthost01-stg.mgmt.fedoraproject.org - virthost02.mgmt.fedoraproject.org - virthost03.mgmt.fedoraproject.org - - virthost04.mgmt.fedoraproject.org + - bvirthost01-stg.mgmt.fedoraproject.org - virthost05.mgmt.fedoraproject.org - virthost06.mgmt.fedoraproject.org - virthost11.mgmt.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index 64e9415059..aa4cbb7c22 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -8,7 +8,7 @@ virthost01.stg.phx2.fedoraproject.org virthost01.phx2.fedoraproject.org virthost02.phx2.fedoraproject.org virthost03.phx2.fedoraproject.org -virthost04.phx2.fedoraproject.org +bvirthost01.stg.phx2.fedoraproject.org virthost05.phx2.fedoraproject.org virthost11.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org index bb31af05bd..31f862fa6e 100644 --- a/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-01.stg.phx2.fedoraproject.org @@ -1,5 +1,5 @@ --- -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org eth0_ip: 10.5.128.84 gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org index 2712a4348d..4013efd86f 100644 --- a/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-02.stg.phx2.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org eth0_ip: 10.5.128.85 gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org index a6865a5a67..3e16701828 100644 --- a/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-03.stg.phx2.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org eth0_ip: 10.5.128.86 gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org index 5c0be89672..7ca13e90d4 100644 --- a/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-04.stg.phx2.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org eth0_ip: 10.5.128.87 gw: 10.5.128.254 diff --git a/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org b/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org index 1e3e1247d2..4c5cfda998 100644 --- a/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-05.stg.phx2.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org eth0_ip: 10.5.128.69 gw: 10.5.128.254 diff --git a/inventory/host_vars/koji01.stg.phx2.fedoraproject.org b/inventory/host_vars/koji01.stg.phx2.fedoraproject.org index 67ea94ee3a..79fe545436 100644 --- a/inventory/host_vars/koji01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/koji01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-kojistg ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.139 -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org datacenter: phx2 fedmsg_koji_instance: primary diff --git a/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org index 3c417d7e50..318088f1d8 100644 --- a/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org @@ -8,7 +8,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org datacenter: phx2 mem_size: 4096 diff --git a/inventory/host_vars/pgbdr01.stg.phx2.fedoraproject.org b/inventory/host_vars/pgbdr01.stg.phx2.fedoraproject.org index f01975aeb4..69dda31d57 100644 --- a/inventory/host_vars/pgbdr01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/pgbdr01.stg.phx2.fedoraproject.org @@ -4,7 +4,7 @@ gw: 10.5.128.254 dns: 10.5.126.21 volgroup: /dev/vg_server eth0_ip: 10.5.128.172 -vmhost: virthost04.phx2.fedoraproject.org +vmhost: bvirthost01.stg.phx2.fedoraproject.org ks_url: http://infrastructure.phx2.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 ks_repo: http://infrastructure.phx2.fedoraproject.org/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/inventory b/inventory/inventory index cad8811ca2..bd765ec2cb 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -126,6 +126,7 @@ bugzilla2fedmsg01.phx2.fedoraproject.org bugzilla2fedmsg01.stg.phx2.fedoraproject.org [bvirthost] +bvirthost01.stg.phx2.fedoraproject.org bvirthost01.phx2.fedoraproject.org bvirthost04.phx2.fedoraproject.org bvirthost05.phx2.fedoraproject.org @@ -909,7 +910,6 @@ virthost01.stg.phx2.fedoraproject.org virthost01.phx2.fedoraproject.org virthost02.phx2.fedoraproject.org virthost03.phx2.fedoraproject.org -virthost04.phx2.fedoraproject.org virthost05.phx2.fedoraproject.org virthost06.phx2.fedoraproject.org virthost11.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 b9431d1065..bdec4cae8a 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -345,21 +345,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 { option host-name "virthost02"; } - host virthost04 { - hardware ethernet 24:6e:96:05:d9:fc; - fixed-address 10.5.126.144; - next-server 10.5.126.41; - option host-name "virthost04"; - } - -# host virthost05 { -# hardware ethernet E4:1F:13:BA:99:28; -# fixed-address 10.5.126.145; -# next-server 10.5.126.41; -# option host-name "virthost05"; -# filename "pxelinux.0"; -# } - host virthost06 { hardware ethernet 18:66:da:f7:7a:58; fixed-address 10.5.126.146; @@ -368,21 +353,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 { filename "pxelinux.0"; } -# host virthost07 { -# hardware ethernet e4:1f:13:ba:e5:a0; -# fixed-address 10.5.126.147; -# next-server 10.5.126.41; -# option host-name "virthost07"; -# filename "pxelinux.0"; -# } - -# host virthost09 { -# hardware ethernet e4:1f:13:ba:7f:88; -# fixed-address 10.5.126.149; -# next-server 10.5.126.41; -# option host-name "virthost09"; -# filename "pxelinux.0"; -# } host virthost12 { hardware ethernet 34:40:B5:AC:63:D8;