From bc84b7bce6ae97641b3049a1c608e01f831ce8ed Mon Sep 17 00:00:00 2001 From: Mike Turek Date: Fri, 28 Jun 2019 14:31:46 +0000 Subject: [PATCH] devstack: Install arch specific debs only when deploying to that arch Because the shim and grub-efi-amd64-signed packages are specific to x86_64 [0][1], they should only be installed when deploying to an x86_64 node. This removes the packages from the debs/ironic file and moves their installation to lib/ironic, allowing us to install it them based on architecture. [0] https://packages.ubuntu.com/eoan/shim [1] https://packages.ubuntu.com/eoan/grub-efi-amd64-signed Change-Id: I73cab832cf8099c02b3e29df84618c88e5fb5065 --- devstack/files/debs/ironic | 2 -- devstack/lib/ironic | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/devstack/files/debs/ironic b/devstack/files/debs/ironic index d0b7ae42cd..50fa67d7f7 100644 --- a/devstack/files/debs/ironic +++ b/devstack/files/debs/ironic @@ -36,5 +36,3 @@ libvirt-dev socat ipxe-qemu jq -shim -grub-efi-amd64-signed diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 6c517ce28b..0b9f5808ac 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -507,6 +507,12 @@ IRONIC_UEFI_FILES_DIR=${IRONIC_UEFI_FILES_DIR:-/var/lib/libvirt/images} UEFI_LOADER_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_CODE.fd UEFI_NVRAM_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_VARS.fd +# Handle architecture specific package installs +if [[ $IRONIC_HW_ARCH == "x86_64" ]]; then + install_package shim + install_package grub-efi-amd64-signed +fi + # Sanity checks if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then if [[ "$IRONIC_IPXE_ENABLED" == "False" ]] && [[ "$IRONIC_UEFI_BOOT_LOADER" != "grub2" ]]; then