From e6c3ebc283a7e4e4ca66faa6e2178d9ba4b02bb7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 6 Mar 2023 16:03:44 -0800 Subject: [PATCH] Add 3 new hardware machines This adds a new bvmhost in stg ( bvmhost-x86-02.stg ) a new vmhost in stg ( vmhost-x86-09.stg ) and a new autosign box (that will be autosign02 to allow us to set it up and migrate to it). It also adds dhcp config for those and their mgmt interfaces Signed-off-by: Kevin Fenzi --- inventory/hardware | 3 ++ .../autosign02.iad2.fedoraproject.org | 32 ++++++++++++++ .../bvmhost-x86-02.stg.iad2.fedoraproject.org | 40 ++++++++++++++++++ .../vmhost-x86-09.stg.iad2.fedoraproject.org | 42 +++++++++++++++++++ inventory/inventory | 5 +++ .../dhcpd.conf.noc01.iad2.fedoraproject.org | 29 ++++++++++++- 6 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 inventory/host_vars/autosign02.iad2.fedoraproject.org create mode 100644 inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org create mode 100644 inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index 9e47daa44f..f59ade536d 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -4,6 +4,7 @@ ibiblio01.fedoraproject.org ibiblio05.fedoraproject.org # ssh often disabled #autosign01.iad2.fedoraproject.org +#autosign02.iad2.fedoraproject.org virthost-rdu01.fedoraproject.org #virthost-rdu02.fedoraproject.org virthost-cc-rdu01.fedoraproject.org @@ -40,6 +41,7 @@ bvmhost-x86-06.iad2.fedoraproject.org bvmhost-x86-07.iad2.fedoraproject.org bvmhost-x86-08.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org +bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org bvmhost-x86-05.stg.iad2.fedoraproject.org ## @@ -69,6 +71,7 @@ vmhost-x86-06.stg.iad2.fedoraproject.org vmhost-x86-07.iad2.fedoraproject.org vmhost-x86-07.stg.iad2.fedoraproject.org vmhost-x86-08.stg.iad2.fedoraproject.org +vmhost-x86-09.stg.iad2.fedoraproject.org vmhost-x86-11.stg.iad2.fedoraproject.org vmhost-x86-12.stg.iad2.fedoraproject.org worker01.ocp.iad2.fedoraproject.org diff --git a/inventory/host_vars/autosign02.iad2.fedoraproject.org b/inventory/host_vars/autosign02.iad2.fedoraproject.org new file mode 100644 index 0000000000..7a13871f7c --- /dev/null +++ b/inventory/host_vars/autosign02.iad2.fedoraproject.org @@ -0,0 +1,32 @@ +--- +datacenter: iad2 +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "iad2.fedoraproject.org" +dns_search2: "fedoraproject.org" +eth0_ipv4: 10.3.169.28 +eth0_ipv4_gw: 10.3.169.254 +eth0_ipv4_nm: 24 +eth0_mac: "{{ mac1 }}" +has_ipv4: yes +mac1: C8:4B:D6:83:16:22 +mac2: C8:4B:D6:83:16:23 +mac3: 6C:FE:54:57:4D:80 +mac4: 6C:FE:54:57:4D:81 +network_connections: + - autoconnect: yes + ip: + address: + - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" + dhcp4: no + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - "{{ dns_search1 }}" + - "{{ dns_search2 }}" + gateway4: "{{ eth0_ipv4_gw }}" + mac: "{{ eth0_mac }}" + name: eth0 + state: up + type: ethernet diff --git a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..21446110de --- /dev/null +++ b/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org @@ -0,0 +1,40 @@ +--- +br0_ipv4: 10.3.167.12 +br0_ipv4_gw: 10.3.167.254 +br0_ipv4_nm: 24 +br0_port0_mac: "{{ mac3 }}" +datacenter: iad2 +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "stg.iad2.fedoraproject.org" +dns_search2: "iad2.fedoraproject.org" +dns_search3: "fedoraproject.org" +has_ipv4: yes +mac1: C8:4B:D6:88:FB:C6 +mac2: C8:4B:D6:88:FB:C7 +mac3: 6C:FE:54:57:5F:48 +mac4: 6C:FE:54:57:5F:49 +network_connections: + - autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + dhcp4: no + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - "{{ dns_search1 }}" + - "{{ dns_search2 }}" + - "{{ dns_search3 }}" + gateway4: "{{ br0_ipv4_gw }}" + name: br0 + state: up + type: bridge + mtu: 9000 + - mac: "{{ br0_port0_mac }}" + master: br0 + name: br0-port0 + state: up + type: ethernet + mtu: 9000 diff --git a/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..0b014129ea --- /dev/null +++ b/inventory/host_vars/vmhost-x86-09.stg.iad2.fedoraproject.org @@ -0,0 +1,42 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +br0_ipv4: 10.3.166.19 +br0_ipv4_gw: 10.3.166.254 +br0_ipv4_nm: 24 +br0_port0_mac: "{{ mac3 }}" +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "stg.iad2.fedoraproject.org" +dns_search2: "iad2.fedoraproject.org" +dns_search3: "fedoraproject.org" +freezes: false +has_ipv4: yes +mac1: C8:4B:D6:89:F7:5C +mac2: C8:4B:D6:89:F7:5D +mac3: 6C:FE:54:57:80:2C +mac4: 6C:FE:54:57:80:2D +nested: true +network_connections: + - autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + dhcp4: no + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - "{{ dns_search1 }}" + - "{{ dns_search2 }}" + - "{{ dns_search3 }}" + gateway4: "{{ br0_ipv4_gw }}" + name: br0 + state: up + type: bridge + mtu: 9000 + - mac: "{{ br0_port0_mac }}" + master: br0 + name: br0-port0 + state: up + type: ethernet + mtu: 9000 diff --git a/inventory/inventory b/inventory/inventory index 2394bdf90c..ce48095073 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -80,6 +80,7 @@ bvmhost-x86-06.iad2.fedoraproject.org bvmhost-x86-07.iad2.fedoraproject.org bvmhost-x86-08.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org +bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org bvmhost-x86-05.stg.iad2.fedoraproject.org @@ -166,6 +167,7 @@ sign-vault01.iad2.fedoraproject.org [autosign] autosign01.iad2.fedoraproject.org +autosign02.iad2.fedoraproject.org [autosign_stg] autosign01.stg.iad2.fedoraproject.org @@ -629,6 +631,7 @@ badges-web01.stg.iad2.fedoraproject.org # basset01.stg.iad2.fedoraproject.org bodhi-backend01.stg.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org +bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org bvmhost-x86-05.stg.iad2.fedoraproject.org bvmhost-p09-01.stg.iad2.fedoraproject.org @@ -709,6 +712,7 @@ vmhost-x86-05.stg.iad2.fedoraproject.org vmhost-x86-06.stg.iad2.fedoraproject.org vmhost-x86-07.stg.iad2.fedoraproject.org vmhost-x86-08.stg.iad2.fedoraproject.org +vmhost-x86-09.stg.iad2.fedoraproject.org vmhost-x86-11.stg.iad2.fedoraproject.org vmhost-x86-12.stg.iad2.fedoraproject.org wiki01.stg.iad2.fedoraproject.org @@ -770,6 +774,7 @@ vmhost-x86-05.stg.iad2.fedoraproject.org vmhost-x86-06.stg.iad2.fedoraproject.org vmhost-x86-07.stg.iad2.fedoraproject.org vmhost-x86-08.stg.iad2.fedoraproject.org +vmhost-x86-09.stg.iad2.fedoraproject.org vmhost-x86-11.stg.iad2.fedoraproject.org vmhost-x86-12.stg.iad2.fedoraproject.org vmhost-x86-01.iad2.fedoraproject.org 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 bfa4a92ad2..ae338a6381 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org @@ -664,7 +664,7 @@ host vmhost-x86-08-stg { option subnet-mask 255.255.255.0; } host vmhost-x86-09-stg { - hardware ethernet EC:F4:BB:E1:C8:F0; + hardware ethernet c8:4b:d6:8a:69:a2; fixed-address 10.3.166.19; filename "uefi/grubx64.efi"; next-server 10.3.163.10; @@ -717,7 +717,7 @@ host bvmhost-x86-01-stg { option subnet-mask 255.255.255.0; } host bvmhost-x86-02-stg { - hardware ethernet EC:F4:BB:D9:56:10; + hardware ethernet 6C:FE:54:57:5F:48; fixed-address 10.3.167.12; filename "uefi/grubx64.efi"; next-server 10.3.163.10; @@ -819,6 +819,19 @@ host autosign01 { option routers 10.3.169.254; option subnet-mask 255.255.255.0; } +host autosign02 { + hardware ethernet 6C:FE:54:57:4D:80; + fixed-address 10.3.169.47; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.169.254; + option subnet-mask 255.255.255.0; +} +host autosign02-mgmt { + hardware ethernet ; + fixed-address 10.3.160.130; + hardware ethernet c8:4b:d6:8a:4a:a0; +} host bvmhost-x8-07 { hardware ethernet E4:43:4B:B1:2B:52; fixed-address 10.3.169.17; @@ -1782,5 +1795,17 @@ host backup01 { option subnet-mask 255.255.255.0; } +host bvmhost-x86-02-stg-mgmt { + hardware ethernet c8:4b:d6:8a:59:6a; + fixed-address 10.3.160.192; + option host-name "bvmhost-x86-02-stg-mgmt"; +} + +host vmhost-x86-09-stg-mgmt { + hardware ethernet c8:4b:d6:8a:69:a2; + fixed-address 10.3.160.42; + option host-name "vmhost-x86-09-stg-mgmt"; +} + ## End of file