diff options
| author | Mike Turek <mjturek@linux.vnet.ibm.com> | 2019-06-28 14:31:46 +0000 |
|---|---|---|
| committer | Mike Turek <mjturek@linux.vnet.ibm.com> | 2019-07-01 14:59:50 +0000 |
| commit | bc84b7bce6ae97641b3049a1c608e01f831ce8ed (patch) | |
| tree | e58b0ab86b46f32c7e7176a0512f96d4d70e10bd /devstack | |
| parent | f79288bde36f81cf7fc1d1c6ba0832e99528ed61 (diff) | |
| download | ironic-bc84b7bce6ae97641b3049a1c608e01f831ce8ed.tar.gz | |
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
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/files/debs/ironic | 2 | ||||
| -rw-r--r-- | devstack/lib/ironic | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/devstack/files/debs/ironic b/devstack/files/debs/ironic index d0b7ae42c..50fa67d7f 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 6c517ce28..0b9f5808a 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 |