Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
feat(pxe): Add SPR
[csit.git] / fdio.infra.pxe / docker-dnsmasq / etc / dnsmasq.conf
diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
index 23b7285..5776634 100755 (executable)
--- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -16,58 +16,47 @@ dhcp-match=set:efi-x86_64,option:client-arch,9
 dhcp-match=set:efi-aa64,option:client-arch,11
 
 dhcp-boot=tag:leg-x86_64,pxelinux.0
-dhcp-boot=tag:efi-x86_64,grub/grubnetx64.efi.signed
-dhcp-boot=tag:efi-x86_64,grub/grubnetx64.efi.signed
-dhcp-boot=tag:efi-aa64,grub/grubnetaa64.efi.signed
+dhcp-boot=tag:efi-x86_64,grubx64.efi
+dhcp-boot=tag:efi-x86_64,grubx64.efi
+dhcp-boot=tag:efi-aa64,grubaa64.efi
 
 # General DHCP settings.
 dhcp-authoritative
 dhcp-broadcast
 
 # DHCP ranges for yul1_1.
-dhcp-range=yul1_1,10.30.51.16,10.30.51.92,255.255.255.0,infinite
+dhcp-range=yul1_1,10.30.51.16,10.30.51.94,255.255.255.0,infinite
 dhcp-option=yul1_1,option:router,10.30.51.1
 dhcp-option=yul1_1,option:dns-server,1.1.1.1
 dhcp-option=yul1_1,option:dns-server,8.8.8.8
 
 # DHCP ranges for yul1_2.
-dhcp-range=yul1_2,10.32.8.10,10.32.8.25,255.255.255.0,infinite
+dhcp-range=yul1_2,10.32.8.18,10.32.8.25,255.255.255.0,infinite
 dhcp-option=yul1_2,option:router,10.32.8.1
 dhcp-option=yul1_2,option:dns-server,1.1.1.1
 dhcp-option=yul1_2,option:dns-server,8.8.8.8
 
 # Hosts DHCP settings yul1_1 subnet.
-dhcp-host=00:fe:c8:58:1e:f6,10.30.51.16,s16-nomad,infinite # enp16s0f0
-dhcp-host=00:fe:c8:e5:68:c2,10.30.51.17,s17-nomad,infinite # enp8s0f0
-dhcp-host=00:f2:8b:7c:fb:4a,10.30.51.18,s18-nomad,infinite # enp16s0f0
-dhcp-host=58:ac:78:5c:90:78,10.30.51.19,s19-nomad,infinite # enp16s0f0
-dhcp-host=00:f2:8b:7c:fb:12,10.30.51.20,s20-nomad,infinite # enp8s0f0
-dhcp-host=00:42:68:6f:68:ee,10.30.51.21,s21-nomad,infinite # enp9s0f0
-dhcp-host=00:42:68:6f:6f:c0,10.30.51.22,s22-nomad,infinite # enp9s0f0
 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
-dhcp-host=ac:1f:6b:8a:8d:b6,10.30.51.44,s3-t21-sut1,infinite # eno1
-dhcp-host=ac:1f:6b:8a:8d:94,10.30.51.45,s4-t21-tg1,infinite # eno1
-dhcp-host=ac:1f:6b:8b:54:c4,10.30.51.46,s11-t31-sut1,infinite # eno1
-dhcp-host=ac:1f:6b:8b:56:b6,10.30.51.47,s12-t31-sut2,infinite # eno1
-dhcp-host=ac:1f:6b:8b:55:78,10.30.51.48,s13-t31-tg1,infinite # eno1
 dhcp-host=ac:1f:6b:8b:53:60,10.30.51.49,s19-t33t211-tg1,infinite # eno1
 dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s1-t11-sut1,infinite # eno1
 dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s2-t12-sut1,infinite # eno1
-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
+dhcp-host=7c:c2:55:27:58:36,10.30.51.52,s52-t21-sut1,infinite # eno1
+dhcp-host=7c:c2:55:25:3b:4a,10.30.51.53,s53-t21-tg1,infinite # eno1
+dhcp-host=7c:c2:55:27:58:44,10.30.51.54,s54-t22-sut1,infinite # eno1
+dhcp-host=7c:c2:55:27:58:1c,10.30.51.55,s55-t22-tg1,infinite # eno1
+dhcp-host=7c:c2:55:25:3b:4c,10.30.51.56,s56-t23-sut1,infinite # eno1
+dhcp-host=7c:c2:55:25:3b:2e,10.30.51.57,s57-t23-tg1,infinite # eno1
+dhcp-host=7c:c2:55:27:58:42,10.30.51.58,s58-t24-sut1,infinite # eno1
+dhcp-host=7c:c2:55:27:58:aa,10.30.51.59,s59-t24-tg1,infinite # eno1 ###########
 dhcp-host=e0:d5:5e:ae:70:26,10.30.51.69,s27-t211-sut1,infinite # eno1
 dhcp-host=b4:2e:99:ab:1d:e8,10.30.51.70,s55-t13-sut1,infinite # enp8s0f0
 dhcp-host=b4:2e:99:ab:1d:dc,10.30.51.71,s56-t14-sut1,infinite # enp8s0f0
@@ -95,10 +84,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
Integration tests