From 84e5b70f53cfab56b0fd7d27b81dfeab80ba8d42 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Feb 18 2021 21:44:51 +0000 Subject: Bring up new Lenovo and Dell systems in IAD2 This starts adding in the general host_vars and changes to dhcpd.conf needed to bring up buildhw boxes and new staging servers. --- diff --git a/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org new file mode 100644 index 0000000..73b11d7 --- /dev/null +++ b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.147 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "e8:6a:64:39:18:ef" +mgmt_ipv4: "10.3.160.114" +mac0: 68:05:ca:8e:9b:86 +mac1: 50:6b:4b:6a:b6:20 +mac2: 50:6b:4b:6a:b6:21 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org new file mode 100644 index 0000000..b81093c --- /dev/null +++ b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true + +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.148 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "E8:6A:64:39:18:73" +mgmt_ipv4: "10.3.160.116" +mac0: 68:05:ca:8a:f0:29 +mac1: 50:6b:4b:6a:eb:b0 +mac2: 50:6b:4b:6a:eb:b1 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org new file mode 100644 index 0000000..a317f34 --- /dev/null +++ b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true + +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.149 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "E8:6A:64:39:19:67" +mgmt_ipv4: "10.3.160.117" +mac0: 00:1b:21:dc:4e:32 +mac1: 50:6b:4b:6a:ea:60 +mac2: 50:6b:4b:6a:ea:61 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org new file mode 100644 index 0000000..ebc6145 --- /dev/null +++ b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.150 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "E8:6A:64:39:19:67" +mgmt_ipv4: "10.3.160.118" +mac0: 68:05:CA:8E:98:C7 +mac1: 50:6B:4B:6A:C4:90 +mac2: 50:6B:4B:6A:C4:91 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org new file mode 100644 index 0000000..6841c74 --- /dev/null +++ b/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org @@ -0,0 +1,44 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +br0_ipv4: 10.3.167.14 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.167.254 + +mgmt_mac: "B8:2A:72:FC:EE:68" +mgmt_ipv4: 10.3.160.199 +mac1: EC:F4:BB:D2:8F:00 +mac2: EC:F4:BB:D2:8F:02 +mac3: EC:F4:BB:D2:8F:04 +mac4: EC:F4:BB:D2:8F:05 + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org new file mode 100644 index 0000000..67f2f0f --- /dev/null +++ b/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org @@ -0,0 +1,44 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +br0_ipv4: 10.3.167.17 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.167.254 + +mgmt_mac: "2c:ea:7f:f3:58:4e" +mgmt_ipv4: 10.3.160.157 +mac1: E4:43:4B:F7:AC:CC +mac2: E4:43:4B:F7:AC:CE +mac3: E4:43:4B:F7:AC:EC +mac4: E4:43:4B:F7:AC:ED + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org new file mode 100644 index 0000000..0b1754c --- /dev/null +++ b/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org @@ -0,0 +1,42 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 + +has_ipv4: yes +br0_ipv4: 10.3.166.28 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.166.254 + +mgmt_mac: 2c:ea:7f:f3:6c:be +mgmt_ipv4: 10.3.160.46 +mac1: E4:43:4B:F7:B7:B8 +mac2: E4:43:4B:F7:B7:BA +mac3: E4:43:4B:F7:B7:D8 +mac4: E4:43:4B:F7:B7:D9 + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org new file mode 100644 index 0000000..2c4f026 --- /dev/null +++ b/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org @@ -0,0 +1,42 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 + +has_ipv4: yes +br0_ipv4: 10.3.166.29 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.166.254 + +mgmt_mac: 2c:ea:7f:f3:82:fc +mgmt_ipv4: 10.3.160.47 +mac1: E4:43:4B:F7:AD:10 +mac2: E4:43:4B:F7:AD:12 +mac3: E4:43:4B:F7:AD:30 +mac4: E4:43:4B:F7:AD:31 + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org index 78aa8bc..5103621 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org @@ -630,6 +630,33 @@ host vmhost-x86-10-stg { option subnet-mask 255.255.255.0; } +host vmhost-x86-11-stg-mgmt { + hardware ethernet 2c:ea:7f:f3:6c:be; + fixed-address 10.3.160.46; + option host-name "vmhost-x86-11-stg"; +} +host vmhost-x86-11-stg { + hardware ethernet E4:43:4B:F7:B7:B8; + fixed-address 10.3.166.28; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.166.254; + option subnet-mask 255.255.255.0; +} + +host vmhost-x86-12-stg-mgmt { + hardware ethernet 2c:ea:7f:f3:82:fc; + fixed-address 10.3.160.47; + option host-name "vmhost-x86-12-stg"; +} +host vmhost-x86-12-stg { + hardware ethernet E4:43:4B:F7:AD:10; + fixed-address 10.3.166.29; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.166.254; + option subnet-mask 255.255.255.0; +} host bvmhost-x86-01-stg { hardware ethernet 24:6E:96:B1:56:20; @@ -655,6 +682,12 @@ host bvmhost-x86-03-stg { option routers 10.3.167.254; option subnet-mask 255.255.255.0; } + +host bvmhost-x86-04-stg-mgmt { + hardware ethernet B8:2A:72:FC:EE:68; + fixed-address 10.3.160.199; + option host-name "bvmhost-x86-04-stg-mgmt"; +} host bvmhost-x86-04-stg { hardware ethernet EC:F4:BB:D2:8F:00; fixed-address 10.3.167.14; @@ -664,6 +697,19 @@ host bvmhost-x86-04-stg { option subnet-mask 255.255.255.0; } +host bvmhost-x86-05-stg-mgmt { + hardware ethernet 2c:ea:7f:f3:58:4e; + fixed-address 10.3.160.157; + option host-name "bvmhost-x86-05-stg"; +} +host bvmhost-x86-05-stg { + hardware ethernet E4:43:4B:F7:AC:CC; + fixed-address 10.3.167.17; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.166.254; + option subnet-mask 255.255.255.0; +} # Build network @@ -1028,6 +1074,62 @@ host buildhw-a64-11 { option routers 10.3.170.254; option host-name "buildhw-a64-11"; } + +host buildhw-a64-21-mgmt { + hardware ethernet e8:6a:64:39:18:ef; + fixed-address 10.3.160.114; + option host-name "bvmhost-a64-21-mgmt"; +} +host buildhw-a64-21 { + hardware ethernet 50:6b:4b:6a:b6:20 ; + fixed-address 10.3.170.147; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} +host buildhw-a64-22-mgmt { + hardware ethernet E8:6A:64:39:18:73; + fixed-address 10.3.160.116; + option host-name "bvmhost-a64-22-mgmt"; +} +host buildhw-a64-22 { + hardware ethernet 50:6b:4b:6a:eb:b0 ; + fixed-address 10.3.170.148; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} +host buildhw-a64-23-mgmt { + hardware ethernet E8:6A:64:39:19:67; + fixed-address 10.3.160.117; + option host-name "bvmhost-a64-23-mgmt"; +} +host buildhw-a64-23 { + hardware ethernet 50:6b:4b:6a:ea:60; + fixed-address 10.3.170.149; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} +host buildhw-a64-24-mgmt { + hardware ethernet E8:6A:64:39:19:67; + fixed-address 10.3.160.118; + option host-name "bvmhost-a64-24-mgmt"; +} +host buildhw-a64-24 { + hardware ethernet 50:6B:4B:6A:C4:90 ; + fixed-address 10.3.170.150; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} + + + host bkernel02 { hardware ethernet d0:94:66:45:8c:0f; option routers 10.3.169.254; @@ -1490,11 +1592,6 @@ host dell-630-01-mgmt { fixed-address 10.3.160.191; option host-name "bvirthost14"; } -host system-vmhost-mgmt { - hardware ethernet B8:2A:72:FC:EE:68; - fixed-address 10.3.160.199; - option host-name "vmhost-11-mgmt"; -} host dell-r6x0-16-mgmt { hardware ethernet 58:8A:5A:EE:F2:0E;