diff options
19 files changed, 16 insertions, 527 deletions
diff --git a/docs/lab/fdio-dc-physical.md b/docs/lab/fdio-dc-physical.md index d89523e3eb..3923bb09d9 100644 --- a/docs/lab/fdio-dc-physical.md +++ b/docs/lab/fdio-dc-physical.md @@ -111,6 +111,8 @@ s64-t34-tg1,up,t34,3n-alt,SYS-740GP-TNRT,C7470KK40P50249,10.30.51.74,10.30.50.74 name,oper-status,testbed-id,role,model,s/n,mgmt-ip4,ipmi-ip4,rackid,rackunit yul1-12-lb4m,up,switch,uplink,?,?,?,?,3016.12,u47 +s28-nomad,up,nomad-cluster1.nomad-client,SYS-7049GP-TRT,C7470KH06A20196,10.30.51.28,10.30.50.28,3016.12,u41-u44 +s27-nomad,up,nomad-cluster1,nomad-client,SYS-7049GP-TRT,C7470KH06A20055,10.30.51.27,10.30.50.27,3016.12,u37-u40 s91-nomad,up,nomad-cluster1,nomad-client,R152-P30-00,GLG4P9912A0016,10.30.51.91,10.30.50.91,3016.12,u36 s92-nomad,up,nomad-cluster1,nomad-client,R152-P30-00,GLG4P9912A0004,10.30.51.92,10.30.50.92,3016.12,u35 s23-nomad,up,nomad-cluster1,nomad-server,SYS-1029P-WTRT,C1160LI12NM0256,10.30.51.23,10.30.51.23,3016.12,u34 diff --git a/docs/lab/fdio-dc-physical.yaml b/docs/lab/fdio-dc-physical.yaml index 2f973d1755..97efe26af4 100644 --- a/docs/lab/fdio-dc-physical.yaml +++ b/docs/lab/fdio-dc-physical.yaml @@ -112,48 +112,6 @@ yul1: mgmt_ip4: N/A lom_ip4: N/A lom_type: N/A - - unit: 42..45 - name: s11-t31-sut1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20037 - mgmt_ip4: 10.30.51.46 - lom_ip4: 10.30.50.43 - - unit: 38..41 - name: s12-t31-sut2 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20018 - mgmt_ip4: 10.30.51.47 - lom_ip4: 10.30.50.44 - - unit: 34..37 - name: s13-t31-tg1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20043 - mgmt_ip4: 10.30.51.48 - lom_ip4: 10.30.50.45 - - unit: 30..33 - name: s14-t32-sut1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20075 - mgmt_ip4: 10.30.51.58 - lom_ip4: 10.30.50.55 - - unit: 26..29 - name: s15-t32-sut2 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20010 - mgmt_ip4: 10.30.51.59 - lom_ip4: 10.30.50.56 - - unit: 22..25 - name: s16-t32-tg1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20047 - mgmt_ip4: 10.30.51.60 - lom_ip4: 10.30.50.57 - unit: 18..21 name: s25-t25-sut1 oper_status: stage @@ -220,48 +178,6 @@ yul1: serial_number: C7470KH06A20154 mgmt_ip4: 10.30.51.50 lom_ip4: 10.30.50.47 - - unit: 34..37 - name: s3-t21-sut1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20167 - mgmt_ip4: 10.30.51.44 - lom_ip4: 10.30.50.41 - - unit: 30..33 - name: s4-t21-tg1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20158 - mgmt_ip4: 10.30.51.45 - lom_ip4: 10.30.50.42 - - unit: 26..29 - name: s5-t22-sut1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: N/A - mgmt_ip4: 10.30.51.52 - lom_ip4: 10.30.50.49 - - unit: 22..25 - name: s6-t22-tg1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: N/A - mgmt_ip4: 10.30.51.53 - lom_ip4: 10.30.50.50 - - unit: 18..21 - name: s7-t23-sut1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: N/A - mgmt_ip4: 10.30.51.54 - lom_ip4: 10.30.50.51 - - unit: 14..17 - name: s8-t23-tg1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20035 - mgmt_ip4: 10.30.51.55 - lom_ip4: 10.30.50.52 - unit: 10..13 name: s93-t39-sut1 oper_status: production @@ -327,27 +243,6 @@ yul1: serial_number: N/A mgmt_ip4: 10.30.51.71 lom_ip4: 10.30.50.71 - - unit: 39..40 - name: s20-nomad - oper_status: production - device_type: UCSC-C240-M4SX - serial_number: FCH1950V1FQ - mgmt_ip4: 10.30.51.20 - lom_ip4: 10.30.50.20 - - unit: 37..38 - name: s22-nomad - oper_status: production - device_type: UCSC-C240-M4SX - serial_number: FCH2013V0HZ - mgmt_ip4: 10.30.51.22 - lom_ip4: 10.30.50.22 - - unit: 35..36 - name: s21-nomad - oper_status: production - device_type: UCSC-C240-M4SX - serial_number: FCH2013V0J2 - mgmt_ip4: 10.30.51.21 - lom_ip4: 10.30.50.21 - unit: 31..34 name: s78-t38-sut1 oper_status: production @@ -369,34 +264,6 @@ yul1: serial_number: C7470KL03P50454 mgmt_ip4: 10.30.51.80 lom_ip4: 10.30.50.80 - - unit: 19..20 - name: s16-nomad - oper_status: production - device_type: UCSC-C240-M4S - serial_number: FCH1950V1FN - mgmt_ip4: 10.30.51.16 - lom_ip4: 10.30.50.16 - - unit: 17..18 - name: s17-nomad - oper_status: production - device_type: UCSC-C240-M4S - serial_number: FCH1950V1H5 - mgmt_ip4: 10.30.51.17 - lom_ip4: 10.30.50.17 - - unit: 15..16 - name: s18-nomad - oper_status: production - device_type: UCSC-C240-M4S - serial_number: FCH1950V1FS - mgmt_ip4: 10.30.51.18 - lom_ip4: 10.30.50.18 - - unit: 13..14 - name: s19-nomad - oper_status: production - device_type: UCSC-C240-M4S - serial_number: FCH1950V1FL - mgmt_ip4: 10.30.51.19 - lom_ip4: 10.30.50.19 - unit: 11..12 name: s55-t13-sut1 oper_status: production @@ -438,34 +305,6 @@ yul1: - unit: 47 name: yul1-12-lb4m oper_status: production - - unit: 45 - name: s31-t35-sut2 - oper_status: production - device_type: SYS-E300-9A - serial_number: CE300AG39040898 - mgmt_ip4: 10.32.8.13 - lom_ip4: 10.30.55.13 - - unit: 44 - name: s30-t35-sut1 - oper_status: production - device_type: SYS-E300-9A - serial_number: CE300AG39040866 - mgmt_ip4: 10.32.8.12 - lom_ip4: 10.30.55.12 - - unit: 43 - name: s29-t26-sut1 - oper_status: production - device_type: SYS-E300-9A - serial_number: CE300AG39040897 - mgmt_ip4: 10.32.8.11 - lom_ip4: 10.30.55.11 - - unit: 39..42 - name: s28-t26t35-tg1 - oper_status: production - device_type: SYS-7049GP-TRT - serial_number: C7470KH06A20137 - mgmt_ip4: 10.32.8.10 - lom_ip4: 10.30.55.10 - unit: 36 name: s58-nomad oper_status: diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf index 23b7285612..e656c3b96a 100755 --- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -48,6 +48,8 @@ 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 @@ -63,8 +65,6 @@ 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 @@ -95,10 +95,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 diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:c9:58 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:c9:58 deleted file mode 100644 index 42306557a6..0000000000 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:c9:58 +++ /dev/null @@ -1,4 +0,0 @@ -menuentry "Install s30-t35-sut1" { - linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=0c:c4:7a:fc:c9:58 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/ --- console=ttyS0,115200n8 quiet - initrd /casper/ubuntu-jammy-amd64/initrd -} diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:90 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:90 deleted file mode 100644 index 176ee9ec73..0000000000 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:90 +++ /dev/null @@ -1,4 +0,0 @@ -menuentry "Install s31-t35-sut2" { - linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=0c:c4:7a:fc:ca:90 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/ --- console=ttyS0,115200n8 quiet - initrd /casper/ubuntu-jammy-amd64/initrd -} diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:cc b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:cc deleted file mode 100644 index 50ef427360..0000000000 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-0c:c4:7a:fc:ca:cc +++ /dev/null @@ -1,4 +0,0 @@ -menuentry "Install s29-t26-sut1" { - linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=0c:c4:7a:fc:ca:cc url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/ --- console=ttyS0,115200n8 quiet - initrd /casper/ubuntu-jammy-amd64/initrd -} diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a index 4a30ad7ea4..ffad82c274 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a @@ -1,4 +1,4 @@ -menuentry "Install s10-t24-tg1" { +menuentry "Install s28-nomad" { linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8d:0a url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-jammy-amd64/initrd } diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:54:c8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:54:c8 deleted file mode 100644 index 6a61026c2e..0000000000 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:54:c8 +++ /dev/null @@ -1,4 +0,0 @@ -menuentry "Install s28-t26t35-tg1" { - linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:54:c8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/ --- console=ttyS0,115200n8 quiet - initrd /casper/ubuntu-jammy-amd64/initrd -} diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8 index e7ee1cf87e..dc83576bc2 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8 @@ -1,4 +1,4 @@ -menuentry "Install s9-t24-sut1" { +menuentry "Install s27-nomad" { linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:55:d8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-jammy-amd64/initrd } diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/meta-data deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/meta-data +++ /dev/null diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/user-data deleted file mode 100644 index 015444e2aa..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:c9:58/user-data +++ /dev/null @@ -1,83 +0,0 @@ -#cloud-config -autoinstall: - version: 1 - apt: - geoip: true - preserve_sources_list: false - primary: - - arches: [amd64, i386] - uri: http://ca.archive.ubuntu.com/ubuntu - - arches: [default] - uri: http://ports.ubuntu.com/ubuntu-ports - identity: - hostname: s30-t35-sut1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - network: - ethernets: - eno3: - addresses: [ 10.32.8.12/24 ] - dhcp4: false - gateway4: 10.32.8.1 - nameservers: - addresses: [ 1.1.1.1, 8.8.8.8 ] - version: 2 - packages: - - python3 - refresh-installer: - update: no - ssh: - allow-pw: true - authorized-keys: [] - install-server: true - storage: - config: - - grub_device: false - id: disk-sda - path: /dev/sda - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - - device: disk-sda - grub_device: true - id: partition-0 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - - id: format-0 - fstype: fat32 - preserve: false - type: format - volume: partition-0 - - device: disk-sda - flag: '' - grub_device: false - id: partition-1 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - fstype: ext4 - id: format-1 - preserve: false - type: format - volume: partition-1 - - device: format-1 - id: mount-1 - path: / - type: mount - - device: format-0 - id: mount-0 - path: /boot/efi - type: mount
\ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/meta-data deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/meta-data +++ /dev/null diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/user-data deleted file mode 100644 index eb845e2d78..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:90/user-data +++ /dev/null @@ -1,83 +0,0 @@ -#cloud-config -autoinstall: - version: 1 - apt: - geoip: true - preserve_sources_list: false - primary: - - arches: [amd64, i386] - uri: http://ca.archive.ubuntu.com/ubuntu - - arches: [default] - uri: http://ports.ubuntu.com/ubuntu-ports - identity: - hostname: s31-t35-sut1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - network: - ethernets: - eno3: - addresses: [ 10.32.8.13/24 ] - dhcp4: false - gateway4: 10.32.8.1 - nameservers: - addresses: [ 1.1.1.1, 8.8.8.8 ] - version: 2 - packages: - - python3 - refresh-installer: - update: no - ssh: - allow-pw: true - authorized-keys: [] - install-server: true - storage: - config: - - grub_device: false - id: disk-sda - path: /dev/sda - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - - device: disk-sda - grub_device: true - id: partition-0 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - - id: format-0 - fstype: fat32 - preserve: false - type: format - volume: partition-0 - - device: disk-sda - flag: '' - grub_device: false - id: partition-1 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - fstype: ext4 - id: format-1 - preserve: false - type: format - volume: partition-1 - - device: format-1 - id: mount-1 - path: / - type: mount - - device: format-0 - id: mount-0 - path: /boot/efi - type: mount
\ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/meta-data deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/meta-data +++ /dev/null diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/user-data deleted file mode 100644 index 571ac721eb..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/0c:c4:7a:fc:ca:cc/user-data +++ /dev/null @@ -1,83 +0,0 @@ -#cloud-config -autoinstall: - version: 1 - apt: - geoip: true - preserve_sources_list: false - primary: - - arches: [amd64, i386] - uri: http://ca.archive.ubuntu.com/ubuntu - - arches: [default] - uri: http://ports.ubuntu.com/ubuntu-ports - identity: - hostname: s29-t26-sut1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - network: - ethernets: - eno3: - addresses: [ 10.32.8.11/24 ] - dhcp4: false - gateway4: 10.32.8.1 - nameservers: - addresses: [ 1.1.1.1, 8.8.8.8 ] - version: 2 - packages: - - python3 - refresh-installer: - update: no - ssh: - allow-pw: true - authorized-keys: [] - install-server: true - storage: - config: - - grub_device: false - id: disk-sda - path: /dev/sda - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - - device: disk-sda - grub_device: true - id: partition-0 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - - id: format-0 - fstype: fat32 - preserve: false - type: format - volume: partition-0 - - device: disk-sda - flag: '' - grub_device: false - id: partition-1 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - fstype: ext4 - id: format-1 - preserve: false - type: format - volume: partition-1 - - device: format-1 - id: mount-1 - path: / - type: mount - - device: format-0 - id: mount-0 - path: /boot/efi - type: mount
\ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/user-data index d7c357ec39..a4756b3e31 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/user-data @@ -10,10 +10,10 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s7-t24-tg1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser + hostname: s28-nomad + password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 + realname: localadmin + username: localadmin keyboard: layout: us toggle: null @@ -22,7 +22,7 @@ autoinstall: network: ethernets: eno1: - addresses: [ 10.30.51.57/24 ] + addresses: [ 10.30.51.28/24 ] dhcp4: false gateway4: 10.30.51.1 nameservers: diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/meta-data deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/meta-data +++ /dev/null diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/user-data deleted file mode 100644 index c773483892..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:54:c8/user-data +++ /dev/null @@ -1,83 +0,0 @@ -#cloud-config -autoinstall: - version: 1 - apt: - geoip: true - preserve_sources_list: false - primary: - - arches: [amd64, i386] - uri: http://ca.archive.ubuntu.com/ubuntu - - arches: [default] - uri: http://ports.ubuntu.com/ubuntu-ports - identity: - hostname: s28-t26t35-tg1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - network: - ethernets: - eno1: - addresses: [ 10.32.8.10/24 ] - dhcp4: false - gateway4: 10.32.8.1 - nameservers: - addresses: [ 1.1.1.1, 8.8.8.8 ] - version: 2 - packages: - - python3 - refresh-installer: - update: no - ssh: - allow-pw: true - authorized-keys: [] - install-server: true - storage: - config: - - grub_device: false - id: disk-sda - path: /dev/sda - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - - device: disk-sda - grub_device: true - id: partition-0 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - - id: format-0 - fstype: fat32 - preserve: false - type: format - volume: partition-0 - - device: disk-sda - flag: '' - grub_device: false - id: partition-1 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - fstype: ext4 - id: format-1 - preserve: false - type: format - volume: partition-1 - - device: format-1 - id: mount-1 - path: / - type: mount - - device: format-0 - id: mount-0 - path: /boot/efi - type: mount
\ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/user-data index b87fe6e928..1fb3a8f595 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/user-data @@ -10,10 +10,10 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s7-t24-sut1 - password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 - realname: testuser - username: testuser + hostname: s27-nomad + password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 + realname: localadmin + username: localadmin keyboard: layout: us toggle: null @@ -22,7 +22,7 @@ autoinstall: network: ethernets: eno1: - addresses: [ 10.30.51.56/24 ] + addresses: [ 10.30.51.27/24 ] dhcp4: false gateway4: 10.30.51.1 nameservers: |