feat(infra): Infrastructure refresh part 1

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I2a207535376a85a3a44bc3417d98b89737e1cb74
(cherry picked from commit 7d386af36b810527e293f007fa84b79e4156d722)

7 files changed, 4 insertions, 24 deletions

diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
index 23b7285612..e656c3b96a 100755
--- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -48,6 +48,8 @@ dhcp-host=ac:1f:6b:5a:6a:d4,10.30.51.23,s23-nomad,infinite # eno1
 dhcp-host=ac:1f:6b:5a:6a:b4,10.30.51.24,s24-nomad,infinite # eno1
 dhcp-host=ac:1f:6b:5a:6b:08,10.30.51.25,s25-nomad,infinite # eno1
 dhcp-host=ac:1f:6b:ac:d9:2e,10.30.51.26,s26-nomad,infinite # eno1
+dhcp-host=ac:1f:6b:8b:55:d8,10.30.51.27,s27-nomad,infinite # eno1
+dhcp-host=ac:1f:6b:8a:8d:0a,10.30.51.28,s28-nomad,infinite # eno1
 dhcp-host=a0:a3:3b:c1:14:28,10.30.51.36,s17-t33-sut1,infinite # enahisic2i0
 dhcp-host=a0:a3:3b:c1:12:fa,10.30.51.37,s18-t33-sut2,infinite # enahisic2i0
 dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0v0
@@ -63,8 +65,6 @@ dhcp-host=ac:1f:6b:ab:d9:ae,10.30.51.52,s5-t22-sut1,infinite # eno1
 dhcp-host=ac:1f:6b:ab:d7:4a,10.30.51.53,s6-t22-tg1,infinite # eno1
 dhcp-host=ac:1f:6b:ab:d7:92,10.30.51.54,s7-t23-sut1,infinite # eno1
 dhcp-host=ac:1f:6b:8b:56:8c,10.30.51.55,s8-t23-tg1,infinite # eno1
-dhcp-host=ac:1f:6b:8b:55:d8,10.30.51.56,s9-t24-sut1,infinite # eno1
-dhcp-host=ac:1f:6b:8a:8d:0a,10.30.51.57,s10-t24-tg1,infinite # eno1
 dhcp-host=ac:1f:6b:8b:53:64,10.30.51.58,s14-t32-sut1,infinite # eno1
 dhcp-host=ac:1f:6b:8b:56:e2,10.30.51.59,s15-t32-sut2,infinite # eno1
 dhcp-host=ac:1f:6b:8b:55:ae,10.30.51.60,s16-t32-tg1,infinite # eno1
@@ -95,10 +95,6 @@ dhcp-host=a4:bf:01:55:ac:39,10.30.51.93,s93-t39-sut1,infinite # enp4s0
 dhcp-host=a4:bf:01:55:af:5e,10.30.51.94,s94-t39-sut2,infinite # enp4s0
 
 # Hosts DHCP settings yul1_2 subnet.
-dhcp-host=ac:1f:6b:8b:54:c8,10.32.8.10,s28-t26t35-tg1,infinite # eno1
-dhcp-host=0c:c4:7a:fc:ca:cc,10.32.8.11,s29-t26-sut1,infinite # eno3
-dhcp-host=0c:c4:7a:fc:c9:58,10.32.8.12,s30-t35-sut1,infinite # eno3
-dhcp-host=0c:c4:7a:fc:ca:90,10.32.8.13,s31-t35-sut2,infinite # eno3
 dhcp-host=ac:1f:6b:ac:d7:d6,10.32.8.18,s33-t27-sut1,infinite # eno1
 dhcp-host=ac:1f:6b:ac:d7:8c,10.32.8.19,s34-t27-tg1,infinite # eno1
 dhcp-host=ac:1f:6b:ac:d7:c0,10.32.8.20,s35-t28-sut1,infinite # eno1
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:c9:58 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:c9:58
deleted file mode 100644
index 42306557a6..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:c9:58
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s30-t35-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=0c:c4:7a:fc:c9:58 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:90 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:90
deleted file mode 100644
index 176ee9ec73..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:90
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s31-t35-sut2" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=0c:c4:7a:fc:ca:90 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:cc b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:cc
deleted file mode 100644
index 50ef427360..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:cc
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s29-t26-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=0c:c4:7a:fc:ca:cc url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a
index 4a30ad7ea4..ffad82c274 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a
@@ -1,4 +1,4 @@
-menuentry "Install s10-t24-tg1" {
+menuentry "Install s28-nomad" {
     linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8d:0a url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:54:c8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:54:c8
deleted file mode 100644
index 6a61026c2e..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:54:c8
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s28-t26t35-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:54:c8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8
index e7ee1cf87e..dc83576bc2 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8
@@ -1,4 +1,4 @@
-menuentry "Install s9-t24-sut1" {
+menuentry "Install s27-nomad" {
     linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:55:d8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }