diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-08-03 13:05:47 +0200 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2021-09-15 14:05:25 -0700 |
| commit | af4b1587730b614dc28b243f280b21b2d72d22ad (patch) | |
| tree | 27c793446e09ad038b655818353185064c190d6c | |
| parent | e8fc7cb6f91c336ac2f75f3233cdaac167d14b61 (diff) | |
| download | ironic-af4b1587730b614dc28b243f280b21b2d72d22ad.tar.gz | |
Use shim-signed on Ubuntu, shim is empty now
Also fix the documentation to use the correct paths and versions.
Change-Id: I7f004d40c1b8c617f9a456216df091e44d69693f
(cherry picked from commit 294046befae669dacd159d9f26bcdd3bc8ff26c9)
(cherry picked from commit 87dee0250c43e059db727e76b407a0f67c719f43)
| -rw-r--r-- | bindep.txt | 2 | ||||
| -rw-r--r-- | devstack/lib/ironic | 8 | ||||
| -rw-r--r-- | doc/source/install/configure-pxe.rst | 6 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/bindep.txt b/bindep.txt index 80de701b3..87814251d 100644 --- a/bindep.txt +++ b/bindep.txt @@ -23,7 +23,7 @@ syslinux [platform:rpm platform:ubuntu-trusty platform:debian-wheezy default] syslinux-common [platform:ubuntu-xenial platform:debian-jessie default] socat [default] # Grub2 files for boot loadingusing PXE/GRUB2 -shim [platform:dpkg default] +shim-signed [platform:dpkg default] grub-efi-amd64-signed [platform:dpkg default] # these are needed to create and access VMs when testing with virtual hardware diff --git a/devstack/lib/ironic b/devstack/lib/ironic index ae8983772..0f60bf558 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -599,7 +599,7 @@ UEFI_NVRAM_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_VARS.fd if [[ $IRONIC_HW_ARCH == "x86_64" ]]; then install_package shim if is_ubuntu; then - install_package grub-efi-amd64-signed + install_package grub-efi-amd64-signed shim-signed elif is_fedora; then install_package grub2-efi fi @@ -624,7 +624,11 @@ if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then fi if is_ubuntu && [[ -z $IRONIC_GRUB2_FILE ]]; then - IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi + if [[ -f /usr/lib/shim/shimx64.efi.signed ]]; then + IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi.signed + else + IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi + fi IRONIC_GRUB2_FILE=/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed fi diff --git a/doc/source/install/configure-pxe.rst b/doc/source/install/configure-pxe.rst index d06c1f419..c9bbd300c 100644 --- a/doc/source/install/configure-pxe.rst +++ b/doc/source/install/configure-pxe.rst @@ -122,7 +122,7 @@ the PXE UEFI environment. #. Install Grub2 and shim packages: - Ubuntu (16.04LTS and later):: + Ubuntu (18.04LTS and later):: sudo apt-get install grub-efi-amd64-signed shim-signed @@ -136,9 +136,9 @@ the PXE UEFI environment. #. Copy grub and shim boot loader images to ``/tftpboot`` directory: - Ubuntu (16.04LTS and later):: + Ubuntu (18.04LTS and later):: - sudo cp /usr/lib/shim/shim.efi.signed /tftpboot/bootx64.efi + sudo cp /usr/lib/shim/shimx64.efi.signed /tftpboot/bootx64.efi sudo cp /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed /tftpboot/grubx64.efi Fedora:: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index bd8bc32b7..77a1bc8ee 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -24,9 +24,7 @@ - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect - ironic-tempest-ipa-partition-bios-agent_ipmitool-indirect - ironic-tempest-bfv - # Temporary to allow for multiple breakages to be resolved. - - ironic-tempest-ipa-partition-uefi-pxe-grub2: - voting: false + - ironic-tempest-ipa-partition-uefi-pxe-grub2 - metalsmith-integration-glance-localboot-centos7 # Non-voting jobs - ironic-tox-bandit: @@ -63,7 +61,7 @@ - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect - ironic-tempest-ipa-partition-bios-agent_ipmitool-indirect - ironic-tempest-bfv - # - ironic-tempest-ipa-partition-uefi-pxe-grub2 + - ironic-tempest-ipa-partition-uefi-pxe-grub2 - metalsmith-integration-glance-localboot-centos7 experimental: jobs: |