openstack/ironic
Code Issues Proposed changes

Merge "devstack: Install arch specific debs only when deploying to that arch"

Browse Source
This commit is contained in:
Zuul 2019-07-02 11:27:06 +00:00 committed by Gerrit Code Review
commit 421e34c305
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/files/debs/ironic
View File

@ -36,5 +36,3 @@ libvirt-dev
socat socat
ipxe-qemu ipxe-qemu
jq jq
shim
grub-efi-amd64-signed

6
devstack/lib/ironic
View File

@ -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_LOADER_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_CODE.fd
UEFI_NVRAM_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_VARS.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 # Sanity checks
if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
if [[ "$IRONIC_IPXE_ENABLED" == "False" ]] && [[ "$IRONIC_UEFI_BOOT_LOADER" != "grub2" ]]; then if [[ "$IRONIC_IPXE_ENABLED" == "False" ]] && [[ "$IRONIC_UEFI_BOOT_LOADER" != "grub2" ]]; then