diff options
| author |   Peter Mikus <peter.mikus@protonmail.ch> | 2024-11-20 11:41:36 +0100 |
|---|---|---|
| committer | Peter Mikus <peter.mikus@protonmail.ch> | 2024-11-20 11:41:36 +0100 |
| commit | a16d6477e52e2e70d1a2caab0c78301233e06c42 (patch) | |
| tree | 8410fe9236df1ae82b9147aa514e0a4767bcf14a /fdio.infra/pxe/docker-dnsmasq | |
| parent | 309ceb0d58739b910d5474d1462cde2a6791e6fa (diff) | |
feat(infra): vpp_device repurpose
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I8e4faec87c2c1aa7a9fd4f8086d647fbdb24565b
Diffstat (limited to 'fdio.infra/pxe/docker-dnsmasq')
6 files changed, 21 insertions, 21 deletions
diff --git a/fdio.infra/pxe/docker-dnsmasq/Dockerfile b/fdio.infra/pxe/docker-dnsmasq/Dockerfile index 7ed526507c..e73a86945b 100644 --- a/fdio.infra/pxe/docker-dnsmasq/Dockerfile +++ b/fdio.infra/pxe/docker-dnsmasq/Dockerfile @@ -24,12 +24,12 @@ RUN echo "Preparing Grub EFI Binary" \ && dpkg-deb --fsys-tarfile grub-common*deb | tar x ./usr/share/grub/unicode.pf2 -O > /var/lib/tftpboot/grub/fonts/unicode.pf2 RUN echo "Preparing Casper Kernel" \ - && wget $ISO_NOBLE_AMD64 -O /ubuntu-24.04-live-server-amd64.iso \ - && isoinfo -i /ubuntu-24.04-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-noble-amd64/initrd \ - && isoinfo -i /ubuntu-24.04-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-noble-amd64/vmlinuz \ - && wget $ISO_NOBLE_ARM64 -O /ubuntu-24.04-live-server-arm64.iso \ - && isoinfo -i /ubuntu-24.04-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-noble-arm64/initrd \ - && isoinfo -i /ubuntu-24.04-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-noble-arm64/vmlinuz + && wget $ISO_NOBLE_AMD64 -O /ubuntu-24.04.1-live-server-amd64.iso \ + && isoinfo -i /ubuntu-24.04.1-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-noble-amd64/initrd \ + && isoinfo -i /ubuntu-24.04.1-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-noble-amd64/vmlinuz \ + && wget $ISO_NOBLE_ARM64 -O /ubuntu-24.04.1-live-server-arm64.iso \ + && isoinfo -i /ubuntu-24.04.1-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-noble-arm64/initrd \ + && isoinfo -i /ubuntu-24.04.1-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-noble-arm64/vmlinuz FROM alpine diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf index 2e6569cd48..f412271485 100755 --- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -25,7 +25,7 @@ dhcp-authoritative dhcp-broadcast # DHCP ranges for yul1_1. -dhcp-range=yul1_1,10.30.51.16,10.30.51.94,255.255.255.0,infinite +dhcp-range=yul1_1,10.30.51.16,10.30.51.96,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 @@ -51,8 +51,8 @@ dhcp-host=ac:1f:6b:5a:6b:08,10.30.51.25,s25-nomad,infinite # eno1np0 dhcp-host=ac:1f:6b:ac:d9:2e,10.30.51.26,s26-nomad,infinite # eno1np0 CLX dhcp-host=ac:1f:6b:8b:55:d8,10.30.51.27,s27-nomad,infinite # eno1 SKX dhcp-host=ac:1f:6b:8a:8d:0a,10.30.51.28,s28-nomad,infinite # eno1 SKX -dhcp-host=7c:c2:55:55:c0:78,10.30.51.30,s30-t15-sut1,infinite # eno1 SPR -dhcp-host=7c:c2:55:55:c0:6c,10.30.51.31,s31-t16-sut1,infinite # eno1 SPR +dhcp-host=7c:c2:55:55:c0:78,10.30.51.30,s30-nomad,infinite # eno1 SPR +dhcp-host=7c:c2:55:55:c0:6c,10.30.51.31,s31-nomad,infinite # eno1 SPR dhcp-host=3c:ec:ef:d9:dd:6b,10.30.51.32,s32-t31-sut1,infinite # eno2 ICXD dhcp-host=3c:ec:ef:d9:de:27,10.30.51.33,s33-t31-sut2,infinite # eno2 ICXD dhcp-host=3c:ec:ef:d9:dd:77,10.30.51.34,s34-t32-sut1,infinite # eno2 ICXD @@ -60,8 +60,8 @@ dhcp-host=3c:ec:ef:d9:dd:eb,10.30.51.35,s35-t32-sut2,infinite # eno2 dhcp-host=b4:96:91:78:2c:18,10.30.51.36,s36-t27-sut1,infinite # enP6s6f0 GRC dhcp-host=3c:ec:ef:b9:cc:44,10.30.51.37,s37-t27-tg1,infinite # eno1 ICX dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0v0 ARM-DEV -dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s50-nomad,infinite # eno1 HST -dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s51-nomad,infinite # eno1 HST +dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s50-nomad,infinite # eno1 SKX +dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s51-nomad,infinite # eno1 SKX dhcp-host=7c:c2:55:27:58:36,10.30.51.52,s52-t21-sut1,infinite # eno1 SPR dhcp-host=7c:c2:55:25:3b:4a,10.30.51.53,s53-t21-tg1,infinite # eno1 SPR dhcp-host=7c:c2:55:27:58:44,10.30.51.54,s54-t22-sut1,infinite # eno1 SPR @@ -70,8 +70,8 @@ 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 SPR dhcp-host=7c:c2:55:27:58:42,10.30.51.58,s58-t24-sut1,infinite # eno1 SPR dhcp-host=7c:c2:55:27:58:5c,10.30.51.59,s59-t24-tg1,infinite # eno1 SPR -dhcp-host=d8:5e:d3:e7:aa:4c,10.30.51.70,s70-t13-sut1,infinite # eno1/enP2p1s0f0 ALT -dhcp-host=d8:5e:d3:e7:a9:6c,10.30.51.71,s71-t14-sut1,infinite # eno1/enP2p1s0f0 ALT +dhcp-host=d8:5e:d3:e7:aa:4c,10.30.51.70,s70-nomad,infinite # eno1/enP2p1s0f0 ALT +dhcp-host=d8:5e:d3:e7:a9:6c,10.30.51.71,s71-nomad,infinite # eno1/enP2p1s0f0 ALT dhcp-host=90:e2:ba:55:be:32,10.30.51.72,s62-t34-sut1,infinite # enp1s0f0 ALT dhcp-host=90:e2:ba:49:db:b4,10.30.51.73,s63-t34-sut2,infinite # enp1s0f0 ALT dhcp-host=3c:ec:ef:b9:cc:56,10.30.51.74,s64-t34-tg1,infinite # eno1 ICX diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:6c b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:6c index a4f6d4b70a..030e89c52b 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:6c +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:6c @@ -1,4 +1,4 @@ -menuentry "Install s31-t16-sut1" { - linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.isoautoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:6c/ --- +menuentry "Install s31-nomad" { + linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:6c/ --- initrd /casper/ubuntu-noble-amd64/initrd } diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:78 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:78 index 3ab24f28c6..fec8d0fb27 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:78 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:55:c0:78 @@ -1,4 +1,4 @@ -menuentry "Install s30-t15-sut1" { - linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:78/ --- +menuentry "Install s30-nomad" { + linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:78/ --- initrd /casper/ubuntu-noble-amd64/initrd } diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c index 5b4cdc9c79..cf7f1dfdc5 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c @@ -1,4 +1,4 @@ -menuentry "Install s71-t14-sut1" { - linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:a9:6c/ --- +menuentry "Install s71-nomad" { + linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:a9:6c/ --- initrd /casper/ubuntu-noble-arm64/initrd } diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c index 474a512d4b..492c830878 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c @@ -1,4 +1,4 @@ -menuentry "Install s70-t13-sut1" { - linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:aa:4c/ --- +menuentry "Install s70-nomad" { + linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:aa:4c/ --- initrd /casper/ubuntu-noble-arm64/initrd } |