From 0e22ff8ede00cc078549a40b4631457f5823a266 Mon Sep 17 00:00:00 2001
From: Pedro Moura <pmoura@redhat.com>
Date: Tue, 5 Nov 2024 13:28:51 -0300
Subject: [PATCH] Remove buildhw-a64-21, 22, 23, 24 and add
 openqa-a64-worker01, 05 and 06

Signed-off-by: Pedro Moura <pmoura@redhat.com>
---
 inventory/builders                            |  4 ---
 inventory/hardware                            | 13 ++++-----
 .../dhcpd.conf.noc01.iad2.fedoraproject.org   | 27 +++++--------------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/inventory/builders b/inventory/builders
index a2b421651f..23f49f30d7 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -173,10 +173,6 @@ buildhw-a64-13.iad2.fedoraproject.org
 buildhw-a64-19.iad2.fedoraproject.org
 buildhw-a64-20.iad2.fedoraproject.org
 # emags
-buildhw-a64-21.iad2.fedoraproject.org
-buildhw-a64-22.iad2.fedoraproject.org
-buildhw-a64-23.iad2.fedoraproject.org
-buildhw-a64-24.iad2.fedoraproject.org
 buildhw-x86-01.iad2.fedoraproject.org
 buildhw-x86-02.iad2.fedoraproject.org
 buildhw-x86-03.iad2.fedoraproject.org
diff --git a/inventory/hardware b/inventory/hardware
index d245370c86..3050821444 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -99,10 +99,6 @@ vmhost-p09-copr01.rdu-cc.fedoraproject.org
 [appliedmicro]
 buildhw-a64-01.iad2.fedoraproject.org
 buildhw-a64-02.iad2.fedoraproject.org
-buildhw-a64-21.iad2.fedoraproject.org
-buildhw-a64-22.iad2.fedoraproject.org
-buildhw-a64-23.iad2.fedoraproject.org
-buildhw-a64-24.iad2.fedoraproject.org
 bvmhost-a64-01.stg.iad2.fedoraproject.org
 buildhw-a64-07.iad2.fedoraproject.org
 buildhw-a64-08.iad2.fedoraproject.org
@@ -114,6 +110,8 @@ buildhw-a64-13.iad2.fedoraproject.org
 openqa-a64-worker01.iad2.fedoraproject.org
 openqa-a64-worker02.iad2.fedoraproject.org
 openqa-a64-worker03.iad2.fedoraproject.org
+openqa-a64-worker05.iad2.fedoraproject.org
+openqa-a64-worker06.iad2.fedoraproject.org
 
 [storinator]
 storinator01.rdu-cc.fedoraproject.org
@@ -134,12 +132,11 @@ buildhw-a64-12.iad2.fedoraproject.org
 buildhw-a64-13.iad2.fedoraproject.org
 buildhw-a64-19.iad2.fedoraproject.org
 buildhw-a64-20.iad2.fedoraproject.org
-buildhw-a64-21.iad2.fedoraproject.org
-buildhw-a64-22.iad2.fedoraproject.org
-buildhw-a64-23.iad2.fedoraproject.org
-buildhw-a64-24.iad2.fedoraproject.org
+openqa-a64-worker01.iad2.fedoraproject.org
 openqa-a64-worker02.iad2.fedoraproject.org
 openqa-a64-worker03.iad2.fedoraproject.org
+openqa-a64-worker05.iad2.fedoraproject.org
+openqa-a64-worker06.iad2.fedoraproject.org
 
 [mtsnow]
 bvmhost-a64-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 a96a5d5ebe..68b3a73485 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -1123,7 +1123,7 @@ host openqa-x64-worker04 {
      option routers 10.3.174.254;
      option subnet-mask 255.255.255.0;
 }
-host openqa-a64-worker01 {
+host openqa-a64-worker01-old {
      hardware ethernet 50:6b:4b:7f:96:30 ;
      fixed-address 10.3.174.61;
      filename "uefi/grubaa64.efi";
@@ -1162,12 +1162,12 @@ host buildhw-a64-02 {
      option host-name "buildhw-a64-02";
 }
 
-host buildhw-a64-21-mgmt {
+host openqa-a64-worker01-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 {
+host openqa-a64-worker01 {
      hardware ethernet 50:6b:4b:6a:b6:20 ;
      fixed-address 10.3.170.151;
      filename "uefi/grubaa64.efi";
@@ -1175,12 +1175,12 @@ host buildhw-a64-21 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host buildhw-a64-22-mgmt {
+host openqa-a64-worker05-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 {
+host openqa-a64-worker05 {
      hardware ethernet 50:6b:4b:6a:eb:b0 ;
      fixed-address 10.3.170.152;
      filename "uefi/grubaa64.efi";
@@ -1188,25 +1188,12 @@ host buildhw-a64-22 {
      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.153;
-     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 {
+host openqa-a64-worker06-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 {
+host openqa-a64-worker06 {
      hardware ethernet 50:6B:4B:6A:C4:90 ;
      fixed-address 10.3.170.154;
      filename "uefi/grubaa64.efi";