From 2ad025ee3405718b29c3346aa1930d248a9bec85 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 22 Jan 2024 10:29:49 +0000 Subject: [PATCH] feat(pxe): 1n-alt Signed-off-by: Peter Mikus Change-Id: I476f10bf8f487c5fdb6d2a091af8db62ed9015d7 --- .../docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc | 4 ---- .../docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8 | 4 ---- .../docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c | 4 ++++ .../docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c | 4 ++++ .../{b4:2e:99:ab:1d:dc => d8:5e:d3:e7:a9:6c}/meta-data | 0 .../{b4:2e:99:ab:1d:dc => d8:5e:d3:e7:a9:6c}/user-data | 12 ++++++------ .../{b4:2e:99:ab:1d:e8 => d8:5e:d3:e7:aa:4c}/meta-data | 0 .../{b4:2e:99:ab:1d:e8 => d8:5e:d3:e7:aa:4c}/user-data | 12 ++++++------ 8 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc delete mode 100644 fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8 create mode 100644 fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c create mode 100644 fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c rename fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/{b4:2e:99:ab:1d:dc => d8:5e:d3:e7:a9:6c}/meta-data (100%) rename fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/{b4:2e:99:ab:1d:dc => d8:5e:d3:e7:a9:6c}/user-data (91%) rename fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/{b4:2e:99:ab:1d:e8 => d8:5e:d3:e7:aa:4c}/meta-data (100%) rename fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/{b4:2e:99:ab:1d:e8 => d8:5e:d3:e7:aa:4c}/user-data (91%) diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc deleted file mode 100644 index 8215906965..0000000000 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc +++ /dev/null @@ -1,4 +0,0 @@ -menuentry "Install s56-t14-sut1" { - linux /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:dc url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/ --- console=ttyAMA0,115200n8 quiet - initrd /casper/ubuntu-jammy-arm64/initrd -} \ No newline at end of file diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8 deleted file mode 100644 index 5e26197062..0000000000 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8 +++ /dev/null @@ -1,4 +0,0 @@ -menuentry "Install s55-t13-sut1" { - linux /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:e8 url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/ --- console=ttyAMA0,115200n8 quiet - initrd /casper/ubuntu-jammy-arm64/initrd -} \ No newline at end of file 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 new file mode 100644 index 0000000000..6b6474f3e1 --- /dev/null +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:a9:6c @@ -0,0 +1,4 @@ +menuentry "Install s71-t14-sut1" { + linux /casper/ubuntu-jammy-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/d8:5e:d3:e7:a9:6c/ --- + initrd /casper/ubuntu-jammy-arm64/initrd +} \ No newline at end of file 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 new file mode 100644 index 0000000000..3c2098270d --- /dev/null +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c @@ -0,0 +1,4 @@ +menuentry "Install s70-t13-sut1" { + linux /casper/ubuntu-jammy-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/d8:5e:d3:e7:aa:4c/ --- + initrd /casper/ubuntu-jammy-arm64/initrd +} \ No newline at end of file diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/meta-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:a9:6c/meta-data similarity index 100% rename from fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/meta-data rename to fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:a9:6c/meta-data diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:a9:6c/user-data similarity index 91% rename from fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/user-data rename to fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:a9:6c/user-data index 2a5157ec4c..3d76c9b8a5 100644 --- a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/user-data +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:a9:6c/user-data @@ -10,7 +10,7 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s56-t14-sut1 + hostname: s71-t14-sut1 password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 realname: localadmin username: localadmin @@ -21,7 +21,7 @@ autoinstall: locale: en_US.UTF-8 network: ethernets: - enp8s0f0: + eno1: addresses: [ 10.30.51.71/24 ] dhcp4: false gateway4: 10.30.51.1 @@ -39,13 +39,13 @@ autoinstall: storage: config: - grub_device: false - id: disk-sda - path: /dev/sda + id: disk-nvme0n1 + path: /dev/nvme0n1 ptable: gpt preserve: false type: disk wipe: superblock-recursive - - device: disk-sda + - device: disk-nvme0n1 grub_device: true id: partition-0 flag: boot @@ -59,7 +59,7 @@ autoinstall: preserve: false type: format volume: partition-0 - - device: disk-sda + - device: disk-nvme0n1 flag: '' grub_device: false id: partition-1 diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/meta-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:aa:4c/meta-data similarity index 100% rename from fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/meta-data rename to fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:aa:4c/meta-data diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:aa:4c/user-data similarity index 91% rename from fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/user-data rename to fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:aa:4c/user-data index 649d2c27b4..d06e4c6e33 100644 --- a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/user-data +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:e7:aa:4c/user-data @@ -10,7 +10,7 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s55-t13-sut1 + hostname: s70-t13-sut1 password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 realname: localadmin username: localadmin @@ -21,7 +21,7 @@ autoinstall: locale: en_US.UTF-8 network: ethernets: - enp8s0f0: + eno1: addresses: [ 10.30.51.70/24 ] dhcp4: false gateway4: 10.30.51.1 @@ -39,13 +39,13 @@ autoinstall: storage: config: - grub_device: false - id: disk-sda - path: /dev/sda + id: disk-nvme0n1 + path: /dev/nvme0n1 ptable: gpt preserve: false type: disk wipe: superblock-recursive - - device: disk-sda + - device: disk-nvme0n1 grub_device: true id: partition-0 flag: boot @@ -59,7 +59,7 @@ autoinstall: preserve: false type: format volume: partition-0 - - device: disk-sda + - device: disk-nvme0n1 flag: '' grub_device: false id: partition-1 -- 2.16.6