aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <peter.mikus@protonmail.ch>2024-11-22 12:26:36 +0100
committerPeter Mikus <peter.mikus@protonmail.ch>2024-11-22 11:27:39 +0000
commit8644442acf1229b0323e9095c3082b2563a1facb (patch)
tree26cc7b06a80ebc8c43e287621a4dd8a561aa7880
parent79a686de8b92c9ec94e193812b5e0ed6d8e8de2d (diff)
feat(infra): 2n-zn2 -> Noble
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch> Change-Id: I328168f7faec252e684de3b6efa57c09d52aaff8
Diffstat
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml (renamed from fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml)6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml (renamed from fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml)19
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/hosts4
-rw-r--r--fdio.infra.ansible/roles/intel/defaults/main.yaml41
-rwxr-xr-xfdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf4
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba4
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e84
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:762
-rw-r--r--fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:43:a3:ba/user-data83
-rw-r--r--fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:46:34:e8/user-data83
-rw-r--r--topologies/available/lf_2n_zn2_testbed210.yaml4
11 files changed, 196 insertions, 58 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
index accb8c5dc9..352bad35f6 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
@@ -1,5 +1,5 @@
---
-# file: host_vars/10.32.8.24.yaml
+# file: host_vars/10.30.51.60.yaml
hostname: "s60-t210-sut1"
grub:
@@ -26,5 +26,5 @@ sysctl:
inventory_ipmi_hostname: "10.30.55.24"
cpu_microarchitecture: "epyc"
-intel_700_matrix: "dpdk23.11"
-mellanox_matrix: "dpdk23.11" \ No newline at end of file
+intel_700_matrix: "dpdk24.07"
+mellanox_matrix: "dpdk24.07" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml
index 629538fa34..7b89421b1e 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml
@@ -1,5 +1,5 @@
---
-# file: host_vars/10.32.8.25.yaml
+# file: host_vars/10.30.51.61.yaml
hostname: "s61-t210-tg1"
grub:
@@ -26,5 +26,18 @@ sysctl:
inventory_ipmi_hostname: "10.30.55.25"
cpu_microarchitecture: "epyc"
-intel_700_matrix: "dpdk22.07"
-mellanox_matrix: "dpdk22.07"
+intel_700_matrix: "dpdk24.07"
+mellanox_matrix: "dpdk24.07"
+
+docker_tg: true
+docker_volumes:
+ - source: "/usr/bin/ofed_info"
+ target: "/usr/bin/ofed_info"
+ - source: "/dev/hugepages"
+ target: "/dev/hugepages"
+ - source: "/dev/vfio"
+ target: "/dev/vfio"
+ - source: "/etc/sudoers"
+ target: "/etc/sudoers"
+ - source: "/usr/lib/firmware/"
+ target: "/usr/lib/firmware/"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts
index 4f5dde4f38..2404c37cff 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/hosts
+++ b/fdio.infra.ansible/inventories/lf_inventory/hosts
@@ -16,7 +16,7 @@ all:
10.30.51.88: #s88-t215-tg1 - octeon
10.30.51.89: #s89-t39t310-tg1 - cascadelake
10.30.51.90: #s90-t31t32-tg1 - icelake
- 10.32.8.25: #s61-t210-tg1 - epyc
+ 10.30.51.61: #s61-t210-tg1 - epyc
sut:
hosts:
10.30.51.32: #s32-t31-sut1 - icelaked
@@ -40,7 +40,7 @@ all:
10.30.51.87: #s87-t215-sut1 - octeon
10.30.51.93: #s93-t39-sut1 - snowridge
10.30.51.94: #s94-t39-sut2 - snowridge
- 10.32.8.24: #s60-t210-sut1 - epyc
+ 10.30.51.60: #s60-t210-sut1 - epyc
nomad:
hosts:
10.30.51.21: #s21-nomad - sapphirerapids
diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml
index d9b27ea91a..d44f83733d 100644
--- a/fdio.infra.ansible/roles/intel/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml
@@ -48,40 +48,18 @@ intel_download_url: "https://downloadmirror.intel.com"
intel_extract_dir: "/opt"
intel_700_compatibility_matrix:
- dpdk22.07:
- # https://doc.dpdk.org/guides/rel_notes/release_22_07.html
- i40e: "2.19.3"
- iavf: "4.5.3"
- nvm: "8.70"
- dpdk23.11:
- # https://doc.dpdk.org/guides/rel_notes/release_23_11.html
- i40e: "2.23.17"
- iavf: "4.9.5"
- nvm: "9.30"
dpdk24.07:
# https://doc.dpdk.org/guides/rel_notes/release_24_07.html
- i40e: "2.25.9"
- iavf: "4.9.5"
+ i40e: "2.25.11"
+ iavf: "4.11.3"
nvm: "9.50"
intel_800_compatibility_matrix:
- dpdk22.07:
- # https://doc.dpdk.org/guides/rel_notes/release_22_07.html
- ice: "1.9.7"
- ddp: "1.3.37.0"
- iavf: "4.5.3"
- nvm: "4.00"
- dpdk23.11:
- # https://doc.dpdk.org/guides/rel_notes/release_23_11.html
- ice: "1.13.7"
- ddp: "1.3.45.0"
- iavf: "4.9.5"
- nvm: "4.40"
dpdk24.07:
# https://doc.dpdk.org/guides/rel_notes/release_24_07.html
- ice: "1.14.11"
+ ice: "1.14.13"
ddp: "1.3.46.0"
- iavf: "4.9.5"
+ iavf: "4.11.3"
nvm: "4.50"
intel_dsa_compatibility_matrix:
@@ -92,22 +70,15 @@ intel_qat_compatibility_matrix:
qat1: "4.22.0-00001"
intel_i40e_url:
- "2.19.3": "i40e%20stable/2.19.3/i40e-2.19.3.tar.gz/download"
- "2.23.17": "i40e%20stable/2.23.17/i40e-2.23.17.tar.gz/download"
- "2.25.9": "i40e%20stable/2.25.9/i40e-2.25.9.tar.gz/download"
+ "2.25.11": "i40e%20stable/2.25.11/i40e-2.25.11.tar.gz/download"
intel_ice_url:
- "1.9.7": "ice%20stable/1.9.7/ice-1.9.7.tar.gz/download"
- "1.13.7": "ice%20stable/1.13.7/ice-1.13.7.tar.gz/download"
- "1.14.11": "ice%20stable/1.14.11/ice-1.14.11.tar.gz/download"
+ "1.14.13": "ice%20stable/1.14.13/ice-1.14.13.tar.gz/download"
intel_iavf_url:
- "4.5.3": "iavf%20stable/4.5.3/iavf-4.5.3.tar.gz/download"
- "4.9.5": "iavf%20stable/4.9.5/iavf-4.9.5.tar.gz/download"
"4.11.3": "iavf%20stable/4.11.3/iavf-4.11.3.tar.gz/download"
intel_ddp_url:
- "1.3.37.0": "738733/800%20Series%20DDP%20Comms%20Package%201.3.37.0.zip"
"1.3.45.0": "785846/738693_ice_comms-1.3.45.0.zip"
intel_dsa_url:
diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
index f412271485..5efb3480b9 100755
--- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -96,7 +96,7 @@ dhcp-host=d8:5e:d3:02:b1:9f,10.30.51.92,s92-nomad,infinite #eno1
dhcp-host=a4:bf:01:55:ac:39,10.30.51.93,s93-t39-sut1,infinite # enp4s0 SNR
dhcp-host=a4:bf:01:55:af:5e,10.30.51.94,s94-t39-sut2,infinite # enp4s0 SNR
# Hosts DHCP settings yul1_2 subnet.
-dhcp-host=3c:ec:ef:43:a3:ba,10.32.8.24,s60-t210-sut1,infinite # eno1np0 ZN2
-dhcp-host=3c:ec:ef:46:34:e8,10.32.8.25,s61-t210-tg1,infinite # eno1np0 ZN2
+dhcp-host=3c:ec:ef:43:a3:ba,10.30.51.60,s60-t210-sut1,infinite # enp1s0f0np0 ZN2
+dhcp-host=3c:ec:ef:46:34:e8,10.30.51.61,s61-t210-tg1,infinite # enp1s0f0np0 ZN2
# Hosts DHCP settings yul1_1_ipmi subnet.
dhcp-host=3c:6d:66:05:55:d8,10.30.50.36,s36-t27-sut1,infinite # eth1 GRC
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba
index afcaa00ea9..085e0c93cb 100644
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba
@@ -1,4 +1,4 @@
menuentry "Install s60-t210-sut1" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:43:a3:ba url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1np0: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/3c:ec:ef:43:a3:ba/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
} \ No newline at end of file
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8
index a8270a561e..e60082ae40 100644
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8
@@ -1,4 +1,4 @@
menuentry "Install s61-t210-tg1" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:46:34:e8 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1np0: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/3c:ec:ef:46:34:e8/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
} \ No newline at end of file
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
index be16a76382..5cb80b05be 100644
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
@@ -1,4 +1,4 @@
menuentry "Install s50-nomad" {
- 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/ac:1f:6b:8a:8c:76/ ---
+ 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/ac:1f:6b:8a:8c:76/ ---
initrd /casper/ubuntu-noble-amd64/initrd
}
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:43:a3:ba/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:43:a3:ba/user-data
index abc84c418a..fbdb37579d 100644
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:43:a3:ba/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:43:a3:ba/user-data
@@ -9,6 +9,72 @@ autoinstall:
uri: http://ca.archive.ubuntu.com/ubuntu
- arches: [default]
uri: http://ports.ubuntu.com/ubuntu-ports
+ sources:
+ docker:
+ source: deb [arch=amd64] https://download.docker.com/linux/ubuntu noble stable
+ key: |
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+ 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
+ YT90qFF93M3v01BbxP+EIY2/9tiIPbrd
+ =0YYh
+ -----END PGP PUBLIC KEY BLOCK-----
identity:
hostname: s60-t210-sut1
password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0
@@ -18,18 +84,29 @@ autoinstall:
layout: us
toggle: null
variant: ''
+ late-commands:
+ - curtin in-target --target=/target -- systemctl enable docker
locale: en_US.UTF-8
network:
ethernets:
eno1np0:
- addresses: [ 10.32.8.24/24 ]
+ addresses: [ 10.30.51.60/24 ]
dhcp4: false
- gateway4: 10.32.8.1
+ gateway4: 10.30.51.1
nameservers:
addresses: [ 1.1.1.1, 8.8.8.8 ]
version: 2
packages:
- - python3
+ - docker-ce
+ - docker-ce-cli
+ - python3-all
+ - python3-apt
+ - python3-cffi
+ - python3-cffi-backend
+ - python3-dev
+ - python3-pip
+ - python3-pyelftools
+ - python3-setuptools
refresh-installer:
update: no
ssh:
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:46:34:e8/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:46:34:e8/user-data
index b2a733efd0..4b53e49fe7 100644
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:46:34:e8/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/3c:ec:ef:46:34:e8/user-data
@@ -9,6 +9,72 @@ autoinstall:
uri: http://ca.archive.ubuntu.com/ubuntu
- arches: [default]
uri: http://ports.ubuntu.com/ubuntu-ports
+ sources:
+ docker:
+ source: deb [arch=amd64] https://download.docker.com/linux/ubuntu noble stable
+ key: |
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+ mQINBFit2ioBEADhWpZ8/wvZ6hUTiXOwQHXMAlaFHcPH9hAtr4F1y2+OYdbtMuth
+ lqqwp028AqyY+PRfVMtSYMbjuQuu5byyKR01BbqYhuS3jtqQmljZ/bJvXqnmiVXh
+ 38UuLa+z077PxyxQhu5BbqntTPQMfiyqEiU+BKbq2WmANUKQf+1AmZY/IruOXbnq
+ L4C1+gJ8vfmXQt99npCaxEjaNRVYfOS8QcixNzHUYnb6emjlANyEVlZzeqo7XKl7
+ UrwV5inawTSzWNvtjEjj4nJL8NsLwscpLPQUhTQ+7BbQXAwAmeHCUTQIvvWXqw0N
+ cmhh4HgeQscQHYgOJjjDVfoY5MucvglbIgCqfzAHW9jxmRL4qbMZj+b1XoePEtht
+ ku4bIQN1X5P07fNWzlgaRL5Z4POXDDZTlIQ/El58j9kp4bnWRCJW0lya+f8ocodo
+ vZZ+Doi+fy4D5ZGrL4XEcIQP/Lv5uFyf+kQtl/94VFYVJOleAv8W92KdgDkhTcTD
+ G7c0tIkVEKNUq48b3aQ64NOZQW7fVjfoKwEZdOqPE72Pa45jrZzvUFxSpdiNk2tZ
+ XYukHjlxxEgBdC/J3cMMNRE1F4NCA3ApfV1Y7/hTeOnmDuDYwr9/obA8t016Yljj
+ q5rdkywPf4JF8mXUW5eCN1vAFHxeg9ZWemhBtQmGxXnw9M+z6hWwc6ahmwARAQAB
+ tCtEb2NrZXIgUmVsZWFzZSAoQ0UgZGViKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3
+ BBMBCgAhBQJYrefAAhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEI2BgDwO
+ v82IsskP/iQZo68flDQmNvn8X5XTd6RRaUH33kXYXquT6NkHJciS7E2gTJmqvMqd
+ tI4mNYHCSEYxI5qrcYV5YqX9P6+Ko+vozo4nseUQLPH/ATQ4qL0Zok+1jkag3Lgk
+ jonyUf9bwtWxFp05HC3GMHPhhcUSexCxQLQvnFWXD2sWLKivHp2fT8QbRGeZ+d3m
+ 6fqcd5Fu7pxsqm0EUDK5NL+nPIgYhN+auTrhgzhK1CShfGccM/wfRlei9Utz6p9P
+ XRKIlWnXtT4qNGZNTN0tR+NLG/6Bqd8OYBaFAUcue/w1VW6JQ2VGYZHnZu9S8LMc
+ FYBa5Ig9PxwGQOgq6RDKDbV+PqTQT5EFMeR1mrjckk4DQJjbxeMZbiNMG5kGECA8
+ g383P3elhn03WGbEEa4MNc3Z4+7c236QI3xWJfNPdUbXRaAwhy/6rTSFbzwKB0Jm
+ ebwzQfwjQY6f55MiI/RqDCyuPj3r3jyVRkK86pQKBAJwFHyqj9KaKXMZjfVnowLh
+ 9svIGfNbGHpucATqREvUHuQbNnqkCx8VVhtYkhDb9fEP2xBu5VvHbR+3nfVhMut5
+ G34Ct5RS7Jt6LIfFdtcn8CaSas/l1HbiGeRgc70X/9aYx/V/CEJv0lIe8gP6uDoW
+ FPIZ7d6vH+Vro6xuWEGiuMaiznap2KhZmpkgfupyFmplh0s6knymuQINBFit2ioB
+ EADneL9S9m4vhU3blaRjVUUyJ7b/qTjcSylvCH5XUE6R2k+ckEZjfAMZPLpO+/tF
+ M2JIJMD4SifKuS3xck9KtZGCufGmcwiLQRzeHF7vJUKrLD5RTkNi23ydvWZgPjtx
+ Q+DTT1Zcn7BrQFY6FgnRoUVIxwtdw1bMY/89rsFgS5wwuMESd3Q2RYgb7EOFOpnu
+ w6da7WakWf4IhnF5nsNYGDVaIHzpiqCl+uTbf1epCjrOlIzkZ3Z3Yk5CM/TiFzPk
+ z2lLz89cpD8U+NtCsfagWWfjd2U3jDapgH+7nQnCEWpROtzaKHG6lA3pXdix5zG8
+ eRc6/0IbUSWvfjKxLLPfNeCS2pCL3IeEI5nothEEYdQH6szpLog79xB9dVnJyKJb
+ VfxXnseoYqVrRz2VVbUI5Blwm6B40E3eGVfUQWiux54DspyVMMk41Mx7QJ3iynIa
+ 1N4ZAqVMAEruyXTRTxc9XW0tYhDMA/1GYvz0EmFpm8LzTHA6sFVtPm/ZlNCX6P1X
+ zJwrv7DSQKD6GGlBQUX+OeEJ8tTkkf8QTJSPUdh8P8YxDFS5EOGAvhhpMBYD42kQ
+ pqXjEC+XcycTvGI7impgv9PDY1RCC1zkBjKPa120rNhv/hkVk/YhuGoajoHyy4h7
+ ZQopdcMtpN2dgmhEegny9JCSwxfQmQ0zK0g7m6SHiKMwjwARAQABiQQ+BBgBCAAJ
+ BQJYrdoqAhsCAikJEI2BgDwOv82IwV0gBBkBCAAGBQJYrdoqAAoJEH6gqcPyc/zY
+ 1WAP/2wJ+R0gE6qsce3rjaIz58PJmc8goKrir5hnElWhPgbq7cYIsW5qiFyLhkdp
+ YcMmhD9mRiPpQn6Ya2w3e3B8zfIVKipbMBnke/ytZ9M7qHmDCcjoiSmwEXN3wKYI
+ mD9VHONsl/CG1rU9Isw1jtB5g1YxuBA7M/m36XN6x2u+NtNMDB9P56yc4gfsZVES
+ KA9v+yY2/l45L8d/WUkUi0YXomn6hyBGI7JrBLq0CX37GEYP6O9rrKipfz73XfO7
+ JIGzOKZlljb/D9RX/g7nRbCn+3EtH7xnk+TK/50euEKw8SMUg147sJTcpQmv6UzZ
+ cM4JgL0HbHVCojV4C/plELwMddALOFeYQzTif6sMRPf+3DSj8frbInjChC3yOLy0
+ 6br92KFom17EIj2CAcoeq7UPhi2oouYBwPxh5ytdehJkoo+sN7RIWua6P2WSmon5
+ U888cSylXC0+ADFdgLX9K2zrDVYUG1vo8CX0vzxFBaHwN6Px26fhIT1/hYUHQR1z
+ VfNDcyQmXqkOnZvvoMfz/Q0s9BhFJ/zU6AgQbIZE/hm1spsfgvtsD1frZfygXJ9f
+ irP+MSAI80xHSf91qSRZOj4Pl3ZJNbq4yYxv0b1pkMqeGdjdCYhLU+LZ4wbQmpCk
+ SVe2prlLureigXtmZfkqevRz7FrIZiu9ky8wnCAPwC7/zmS18rgP/17bOtL4/iIz
+ QhxAAoAMWVrGyJivSkjhSGx1uCojsWfsTAm11P7jsruIL61ZzMUVE2aM3Pmj5G+W
+ 9AcZ58Em+1WsVnAXdUR//bMmhyr8wL/G1YO1V3JEJTRdxsSxdYa4deGBBY/Adpsw
+ 24jxhOJR+lsJpqIUeb999+R8euDhRHG9eFO7DRu6weatUJ6suupoDTRWtr/4yGqe
+ dKxV3qQhNLSnaAzqW/1nA3iUB4k7kCaKZxhdhDbClf9P37qaRW467BLCVO/coL3y
+ Vm50dwdrNtKpMBh3ZpbB1uJvgi9mXtyBOMJ3v8RZeDzFiG8HdCtg9RvIt/AIFoHR
+ H3S+U79NT6i0KPzLImDfs8T7RlpyuMc4Ufs8ggyg9v3Ae6cN3eQyxcK3w0cbBwsh
+ /nQNfsA6uu+9H7NhbehBMhYnpNZyrHzCmzyXkauwRAqoCbGCNykTRwsur9gS41TQ
+ M8ssD1jFheOJf3hODnkKU+HKjvMROl1DK7zdmLdNzA1cvtZH/nCC9KPj1z8QC47S
+ xx+dTZSx4ONAhwbS/LN3PoKtn8LPjY9NP9uDWI+TWYquS2U+KHDrBDlsgozDbs/O
+ jCxcpDzNmXpWQHEtHU7649OXHP7UeNST1mCUCH5qdank0V1iejF6/CfTFU4MfcrG
+ YT90qFF93M3v01BbxP+EIY2/9tiIPbrd
+ =0YYh
+ -----END PGP PUBLIC KEY BLOCK-----
identity:
hostname: s61-t210-tg1
password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0
@@ -18,18 +84,29 @@ autoinstall:
layout: us
toggle: null
variant: ''
+ late-commands:
+ - curtin in-target --target=/target -- systemctl enable docker
locale: en_US.UTF-8
network:
ethernets:
eno1np0:
- addresses: [ 10.32.8.25/24 ]
+ addresses: [ 10.30.51.61/24 ]
dhcp4: false
- gateway4: 10.32.8.1
+ gateway4: 10.30.51.1
nameservers:
addresses: [ 1.1.1.1, 8.8.8.8 ]
version: 2
packages:
- - python3
+ - docker-ce
+ - docker-ce-cli
+ - python3-all
+ - python3-apt
+ - python3-cffi
+ - python3-cffi-backend
+ - python3-dev
+ - python3-pip
+ - python3-pyelftools
+ - python3-setuptools
refresh-installer:
update: no
ssh:
diff --git a/topologies/available/lf_2n_zn2_testbed210.yaml b/topologies/available/lf_2n_zn2_testbed210.yaml
index 838af8b472..b00516b53f 100644
--- a/topologies/available/lf_2n_zn2_testbed210.yaml
+++ b/topologies/available/lf_2n_zn2_testbed210.yaml
@@ -10,7 +10,7 @@ nodes:
TG:
type: TG
subtype: TREX
- host: "10.32.8.25"
+ host: "10.30.51.61"
arch: x86_64
port: 22
username: testuser
@@ -82,7 +82,7 @@ nodes:
model: Intel-X710
DUT1:
type: DUT
- host: "10.32.8.24"
+ host: "10.30.51.60"
arch: x86_64
port: 22
username: testuser