From 2112f4e1edf3f6c431c73cdd2871a1644c38ece6 Mon Sep 17 00:00:00 2001 From: pmikus Date: Tue, 1 Jun 2021 12:00:08 +0000 Subject: Infra: Decommission 3n-hsw - pxe/ansible Signed-off-by: pmikus Change-Id: Ie3ddec5487192217d0921f892098384da73a1ef2 --- fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf | 17 ++++------------- .../tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:4a | 2 +- .../tftpboot/grub/grub.cfg-00:fe:c8:58:1e:f6 | 2 +- .../tftpboot/grub/grub.cfg-00:fe:c8:e5:68:c2 | 2 +- .../tftpboot/grub/grub.cfg-58:ac:78:5c:90:78 | 2 +- .../html/ubuntu_focal_amd64/00:f2:8b:7c:fb:4a/user-data | 10 +++++----- .../html/ubuntu_focal_amd64/00:fe:c8:58:1e:f6/user-data | 10 +++++----- .../html/ubuntu_focal_amd64/00:fe:c8:e5:68:c2/user-data | 10 +++++----- .../html/ubuntu_focal_amd64/58:ac:78:5c:90:78/user-data | 10 +++++----- 9 files changed, 28 insertions(+), 37 deletions(-) (limited to 'fdio.infra.pxe') diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf index a58f30d1a6..97e292f2ca 100755 --- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -37,22 +37,13 @@ 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:e5:6c:76,10.30.51.16,t1-tg1,infinite # enp11s0f0 -dhcp-host=00:fe:c8:e5:68:32,10.30.51.17,t1-sut1,infinite # enp23s0f0 -dhcp-host=cc:46:d6:17:e0:58,10.30.51.18,t1-sut2,infinite # enp25s0f0 -dhcp-host=00:fe:c8:e5:6a:72,10.30.51.20,t2-tg1,infinite # enp11s0f0 -dhcp-host=00:fe:c8:e5:68:e0,10.30.51.21,t2-sut1,infinite # enp25s0f0 -dhcp-host=00:fe:c8:58:1e:f6,10.30.51.22,t2-sut2,infinite # enp25s0f0 -dhcp-host=00:fe:c8:e5:68:c2,10.30.51.24,t3-tg1,infinite # enp11s0f0 -dhcp-host=00:f2:8b:7c:fb:4a,10.30.51.25,t3-sut1,infinite # enp25s0f0 -dhcp-host=58:ac:78:5c:90:78,10.30.51.26,t3-sut2,infinite # enp25s0f0 +dhcp-host=00:fe:c8:58:1e:f6,10.30.51.22,s42-nomad,infinite # enp16s0f0 +dhcp-host=00:fe:c8:e5:68:c2,10.30.51.24,s43-nomad,infinite # enp8s0f0 +dhcp-host=00:f2:8b:7c:fb:4a,10.30.51.25,s44-nomad,infinite # enp16s0f0 +dhcp-host=58:ac:78:5c:90:78,10.30.51.26,s45-nomad,infinite # enp16s0f0 dhcp-host=00:f2:8b:7c:fb:12,10.30.51.28,s41-nomad,infinite # enp8s0f0 dhcp-host=00:42:68:6f:68:ee,10.30.51.29,s39-nomad,infinite # enp9s0f0 dhcp-host=00:42:68:6f:6f:c0,10.30.51.30,s40-nomad,infinite # enp9s0f0 -dhcp-host=6c:41:6a:1f:39:26,10.30.51.32,s42-nomad,infinite # enp2s0f0 -dhcp-host=4c:00:82:ae:5a:f8,10.30.51.33,s43-nomad,infinite # enp1s0f0 -dhcp-host=38:0e:4d:9c:85:7a,10.30.51.34,s44-nomad,infinite # enp1s0f0 -dhcp-host=38:0e:4d:9c:4b:0c,10.30.51.35,s45-nomad,infinite # enp1s0f0 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 diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:4a b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:4a index a66fe1f799..3bec0294b4 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:4a +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:4a @@ -1,4 +1,4 @@ -menuentry "Install t3-sut1" { +menuentry "Install s44-nomad" { linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=00:f2:8b:7c:fb:4a url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/00:f2:8b:7c:fb:4a/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-focal-amd64/initrd } diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:58:1e:f6 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:58:1e:f6 index 76ee0966d9..c5e4db29cb 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:58:1e:f6 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:58:1e:f6 @@ -1,4 +1,4 @@ -menuentry "Install t2-sut2" { +menuentry "Install s42-nomad" { linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=00:fe:c8:58:1e:f6 url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/00:fe:c8:58:1e:f6/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-focal-amd64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:c2 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:c2 index f53e7e9d52..4df0ee86af 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:c2 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:c2 @@ -1,4 +1,4 @@ -menuentry "Install t3-tg1" { +menuentry "Install s43-nomad" { linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=00:fe:c8:e5:68:c2 url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/00:fe:c8:e5:68:c2/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-focal-amd64/initrd } diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-58:ac:78:5c:90:78 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-58:ac:78:5c:90:78 index 4ddca125a9..b179f2afaf 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-58:ac:78:5c:90:78 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-58:ac:78:5c:90:78 @@ -1,4 +1,4 @@ -menuentry "Install t3-sut2" { +menuentry "Install s45-nomad" { linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=58:ac:78:5c:90:78 url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/58:ac:78:5c:90:78/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-focal-amd64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:f2:8b:7c:fb:4a/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:f2:8b:7c:fb:4a/user-data index 723e3af55c..674512a288 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:f2:8b:7c:fb:4a/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:f2:8b:7c:fb:4a/user-data @@ -10,10 +10,10 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: t3-sut1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser + hostname: s44-nomad + password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 + realname: localadmin + username: localadmin keyboard: layout: us toggle: null @@ -21,7 +21,7 @@ autoinstall: locale: en_US.UTF-8 network: ethernets: - enp25s0f0: + enp16s0f0: addresses: [ 10.30.51.25/24 ] dhcp4: false gateway4: 10.30.51.1 diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:58:1e:f6/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:58:1e:f6/user-data index 887fd02536..e562a65562 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:58:1e:f6/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:58:1e:f6/user-data @@ -10,10 +10,10 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: t2-sut2 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser + hostname: s42-nomad + password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 + realname: localadmin + username: localadmin keyboard: layout: us toggle: null @@ -21,7 +21,7 @@ autoinstall: locale: en_US.UTF-8 network: ethernets: - enp25s0f0: + enp16s0f0: addresses: [ 10.30.51.22/24 ] dhcp4: false gateway4: 10.30.51.1 diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:e5:68:c2/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:e5:68:c2/user-data index 0d631b3c9c..64fb9f2423 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:e5:68:c2/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/00:fe:c8:e5:68:c2/user-data @@ -10,10 +10,10 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: t3-tg1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser + hostname: s43-nomad + password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 + realname: localadmin + username: localadmin keyboard: layout: us toggle: null @@ -21,7 +21,7 @@ autoinstall: locale: en_US.UTF-8 network: ethernets: - enp11s0f0: + enp8s0f0: addresses: [ 10.30.51.24/24 ] dhcp4: false gateway4: 10.30.51.1 diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/58:ac:78:5c:90:78/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/58:ac:78:5c:90:78/user-data index 8fa7cd7336..541941e068 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/58:ac:78:5c:90:78/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/58:ac:78:5c:90:78/user-data @@ -10,10 +10,10 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: t3-sut2 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser + hostname: s45-nomad + password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 + realname: localadmin + username: localadmin keyboard: layout: us toggle: null @@ -21,7 +21,7 @@ autoinstall: locale: en_US.UTF-8 network: ethernets: - enp25s0f0: + enp16s0f0: addresses: [ 10.30.51.26/24 ] dhcp4: false gateway4: 10.30.51.1 -- cgit 1.2.3-korg