openstack/kolla
Code Issues Proposed changes

Merge "ironic-pxe: RHEL/CentOS: install AArch64 modules on all GRUB architectures"

Browse Source
This commit is contained in:
Zuul 2020-09-17 09:16:21 +00:00 committed by Gerrit Code Review
commit 9a9ae6e295
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -19,10 +19,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% endif %} {% endif %}
{% if base_arch == 'aarch64' %} # NOTE(hrw): RHEL and CentOS ship those packages on all grub architectures
ENV ironic_arch=aarch64 # (x86_64, ppc64le, aarch64, but not s390x), and therefore can be used on
# any of them to support heterogeneous clusters with AArch64.
{% if base_arch != 's390x' %}
{% set ironic_pxe_packages = ironic_pxe_packages + [ {% set ironic_pxe_packages = ironic_pxe_packages + [
'grub2-efi', 'grub2-tools',
'grub2-efi-aa64-modules' 'grub2-efi-aa64-modules'
] %} ] %}
{% endif %} {% endif %}
@ -41,7 +43,6 @@ ENV ironic_arch=aarch64
'syslinux' 'syslinux'
] %} ] %}
{% elif base_arch == 'aarch64' %} {% elif base_arch == 'aarch64' %}
ENV ironic_arch=aarch64
{% set ironic_pxe_packages = ironic_pxe_packages + [ {% set ironic_pxe_packages = ironic_pxe_packages + [
'grub-efi-arm64' 'grub-efi-arm64'
] %} ] %}

2
docker/ironic/ironic-pxe/extend_start.sh
View File

@ -28,7 +28,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
exit 0 exit 0
fi fi
if [[ "${ironic_arch}" =~ aarch64 ]]; then if [[ -d /usr/lib/grub/arm64-efi ]]; then
modules="boot chain configfile efinet ext2 fat gettext help hfsplus loadenv \ modules="boot chain configfile efinet ext2 fat gettext help hfsplus loadenv \
lsefi normal part_gpt part_msdos read search search_fs_file search_fs_uuid \ lsefi normal part_gpt part_msdos read search search_fs_file search_fs_uuid \
search_label terminal terminfo tftp linux" search_label terminal terminfo tftp linux"