From 95f4fff6a679d69d4fccfb16d4e3a80b7fa97ecd Mon Sep 17 00:00:00 2001 From: Dustin Miller Date: Fri, 11 Feb 2022 10:24:15 -0700 Subject: [PATCH] Change from Packet to Equinix Metal --- CHANGELOG.md | 4 ++++ roles/netbootxyz/defaults/main.yml | 4 ++-- roles/netbootxyz/tasks/generate_disks_arm.yml | 6 +++--- roles/netbootxyz/tasks/generate_disks_efi.yml | 6 +++--- .../netbootxyz/tasks/generate_disks_legacy.yml | 6 +++--- .../netbootxyz/tasks/generate_disks_linux.yml | 2 +- ...boot.xyz-packet.j2 => netboot.xyz-metal.j2} | 4 ++-- roles/netbootxyz/templates/menu/boot.cfg.j2 | 18 +++++++++--------- script/netbootxyz-overrides.yml | 2 +- 9 files changed, 28 insertions(+), 24 deletions(-) rename roles/netbootxyz/templates/disks/{netboot.xyz-packet.j2 => netboot.xyz-metal.j2} (97%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93b1e2a3..d2d230d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [2.0.56] +#### Fixed +- Change from Packet to Equinix Metal + ## [2.0.55] #### Fixed - Hardset Flatcar Linux initrd to fix booting (https://github.com/netbootxyz/netboot.xyz/issues/1070) diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index c8318303..f8941b46 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -473,8 +473,8 @@ releases: name: Digital Ocean - key: gcp name: GCP - - key: packet - name: Packet + - key: metal + name: Equinix Metal - key: vmware name: VMware tinycore: diff --git a/roles/netbootxyz/tasks/generate_disks_arm.yml b/roles/netbootxyz/tasks/generate_disks_arm.yml index 100184e6..2dad21d5 100644 --- a/roles/netbootxyz/tasks/generate_disks_arm.yml +++ b/roles/netbootxyz/tasks/generate_disks_arm.yml @@ -74,13 +74,13 @@ - { src: "bin-arm64-efi/ipxe.efi", dest: "{{ bootloader_filename }}-arm64.efi" } - { src: "bin-arm64-efi/snp.efi", dest: "{{ bootloader_filename }}-arm64-snp.efi" } - { src: "bin-arm64-efi/snponly.efi", dest: "{{ bootloader_filename }}-arm64-snponly.efi" } - when: bootloader_filename != "netboot.xyz-packet" + when: bootloader_filename != "netboot.xyz-metal" - - name: Copy iPXE arm64 EFI builds to http directory for packet + - name: Copy iPXE arm64 EFI builds to http directory for Equinix Metal copy: src: "{{ ipxe_source_dir }}/src/{{ item.src }}" dest: "{{ netbootxyz_root }}/ipxe/{{ item.dest }}" remote_src: True with_items: - { src: "bin-arm64-efi/snp.efi", dest: "{{ bootloader_filename }}-arm64.efi" } - when: bootloader_filename == "netboot.xyz-packet" + when: bootloader_filename == "netboot.xyz-metal" diff --git a/roles/netbootxyz/tasks/generate_disks_efi.yml b/roles/netbootxyz/tasks/generate_disks_efi.yml index 89a0de5f..27d481fb 100644 --- a/roles/netbootxyz/tasks/generate_disks_efi.yml +++ b/roles/netbootxyz/tasks/generate_disks_efi.yml @@ -62,13 +62,13 @@ - { src: "bin-x86_64-efi/ipxe.efi", dest: "{{ bootloader_filename }}.efi" } - { src: "bin-x86_64-efi/snp.efi", dest: "{{ bootloader_filename }}-snp.efi" } - { src: "bin-x86_64-efi/snponly.efi", dest: "{{ bootloader_filename }}-snponly.efi" } - when: bootloader_filename != "netboot.xyz-packet" + when: bootloader_filename != "netboot.xyz-metal" - - name: Copy iPXE EFI builds to http directory for packet + - name: Copy iPXE EFI builds to http directory for Equinix Metal copy: src: "{{ ipxe_source_dir }}/src/{{ item.src }}" dest: "{{ netbootxyz_root }}/ipxe/{{ item.dest }}" remote_src: True with_items: - { src: "bin-x86_64-efi/ipxe.efi", dest: "{{ bootloader_filename }}.efi" } - when: bootloader_filename == "netboot.xyz-packet" + when: bootloader_filename == "netboot.xyz-metal" diff --git a/roles/netbootxyz/tasks/generate_disks_legacy.yml b/roles/netbootxyz/tasks/generate_disks_legacy.yml index 3ebca6c8..83815efa 100644 --- a/roles/netbootxyz/tasks/generate_disks_legacy.yml +++ b/roles/netbootxyz/tasks/generate_disks_legacy.yml @@ -63,7 +63,7 @@ - ".dsk" - ".lkrn" - ".kpxe" - when: bootloader_filename != "netboot.xyz-packet" + when: bootloader_filename != "netboot.xyz-metal" - name: Copy iPXE files for Legacy BIOS to http directory copy: @@ -72,11 +72,11 @@ remote_src: True with_items: - ".kpxe" - when: bootloader_filename == "netboot.xyz-packet" + when: bootloader_filename == "netboot.xyz-metal" - name: Copy undionly.kpxe for Legacy BIOS to http directory copy: src: "{{ ipxe_source_dir }}/src/bin/undionly.kpxe" dest: "{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-undionly.kpxe" remote_src: True - when: bootloader_filename != "netboot.xyz-packet" + when: bootloader_filename != "netboot.xyz-metal" diff --git a/roles/netbootxyz/tasks/generate_disks_linux.yml b/roles/netbootxyz/tasks/generate_disks_linux.yml index bd61b1b7..60637aad 100644 --- a/roles/netbootxyz/tasks/generate_disks_linux.yml +++ b/roles/netbootxyz/tasks/generate_disks_linux.yml @@ -54,4 +54,4 @@ src: "{{ ipxe_source_dir }}/src/bin-x86_64-linux/slirp.linux" dest: "{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-linux.bin" remote_src: True - when: bootloader_filename != "netboot.xyz-packet" + when: bootloader_filename != "netboot.xyz-metal" diff --git a/roles/netbootxyz/templates/disks/netboot.xyz-packet.j2 b/roles/netbootxyz/templates/disks/netboot.xyz-metal.j2 similarity index 97% rename from roles/netbootxyz/templates/disks/netboot.xyz-packet.j2 rename to roles/netbootxyz/templates/disks/netboot.xyz-metal.j2 index e4cd0d91..2e8178a0 100644 --- a/roles/netbootxyz/templates/disks/netboot.xyz-packet.j2 +++ b/roles/netbootxyz/templates/disks/netboot.xyz-metal.j2 @@ -10,10 +10,10 @@ set HTTPS_ERR HTTPS appears to have failed... attempting HTTP set HTTP_ERR HTTP has failed, localbooting... set ipxe_version ${version} set version {{ boot_version }} -set ipxe_cloud_config packet +set ipxe_cloud_config metal :start -echo ${bold}${fg_gre}netboot.xyz ${fg_whi}v${version} for ${fg_red}packet.com${fg_whi}${boldoff} +echo ${bold}${fg_gre}netboot.xyz ${fg_whi}v${version} for ${fg_red}metal.equinix.com${fg_whi}${boldoff} prompt --key m --timeout 4000 Hit the ${bold}m${boldoff} key to open failsafe menu... && goto failsafe || goto dhcp :dhcp diff --git a/roles/netbootxyz/templates/menu/boot.cfg.j2 b/roles/netbootxyz/templates/menu/boot.cfg.j2 index 54b385f6..3099162e 100644 --- a/roles/netbootxyz/templates/menu/boot.cfg.j2 +++ b/roles/netbootxyz/templates/menu/boot.cfg.j2 @@ -99,30 +99,30 @@ goto clouds ################################### :clouds iseq ${ipxe_cloud_config} gce && goto gce || -iseq ${ipxe_cloud_config} packet && goto packet || +iseq ${ipxe_cloud_config} metal && goto metal || goto clouds_end :gce set cmdline console=ttyS0,115200n8 goto clouds_end -:packet -iseq ${arch} i386 && goto packet_x86_64 || -iseq ${arch} x86_64 && goto packet_x86_64 || -iseq ${arch} arm64 && goto packet_arm64 || +:metal +iseq ${arch} i386 && goto metal_x86_64 || +iseq ${arch} x86_64 && goto metal_x86_64 || +iseq ${arch} arm64 && goto metal_arm64 || goto clouds_end -:packet_x86_64 +:metal_x86_64 set cmdline console=ttyS1,115200n8 -iseq ${platform} efi && set ipxe_disk netboot.xyz-packet.efi || set ipxe_disk netboot.xyz-packet.kpxe +iseq ${platform} efi && set ipxe_disk netboot.xyz-metal.efi || set ipxe_disk netboot.xyz-metal.kpxe set menu_linux_i386 0 set menu_freedos 0 set menu_windows 0 goto clouds_end -:packet_arm64 +:metal_arm64 set cmdline console=ttyAMA0,115200 -set ipxe_disk netboot.xyz-packet-arm64.efi +set ipxe_disk netboot.xyz-metal-arm64.efi set menu_bsd 0 set menu_freedos 0 set menu_live 0 diff --git a/script/netbootxyz-overrides.yml b/script/netbootxyz-overrides.yml index 935bae60..12f1e261 100644 --- a/script/netbootxyz-overrides.yml +++ b/script/netbootxyz-overrides.yml @@ -10,7 +10,7 @@ generate_local_vars: false bootloader_multiple: true bootloader_disks: - "netboot.xyz" - - "netboot.xyz-packet" + - "netboot.xyz-metal" generate_signatures: true sigs_dir: "{{ netbootxyz_root }}/sigs" sigs_location: "http://${boot_domain}/sigs/"