diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-17 09:16:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-17 09:16:21 +0000 |
| commit | 9a9ae6e295301cc8e60f81e62ec8fc9fd12c852b (patch) | |
| tree | 0e9c5fc74cf919990b1ade87963df6db8e67fa6b | |
| parent | f92ca7cfa440bcc6668c5fa391e8479bca785f3f (diff) | |
| parent | c3a3c7bee0d5fd68ceef1446a43f19b2d4512614 (diff) | |
| download | kolla-9a9ae6e295301cc8e60f81e62ec8fc9fd12c852b.tar.gz kolla-9a9ae6e295301cc8e60f81e62ec8fc9fd12c852b.zip | |
Merge "ironic-pxe: RHEL/CentOS: install AArch64 modules on all GRUB architectures"
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/extend_start.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index cb2fb3204..700c4dfce 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -19,10 +19,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} - {% if base_arch == 'aarch64' %} -ENV ironic_arch=aarch64 + # NOTE(hrw): RHEL and CentOS ship those packages on all grub architectures + # (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 + [ - 'grub2-efi', + 'grub2-tools', 'grub2-efi-aa64-modules' ] %} {% endif %} @@ -41,7 +43,6 @@ ENV ironic_arch=aarch64 'syslinux' ] %} {% elif base_arch == 'aarch64' %} -ENV ironic_arch=aarch64 {% set ironic_pxe_packages = ironic_pxe_packages + [ 'grub-efi-arm64' ] %} diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index b024d445e..44f101bb0 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -28,7 +28,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 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 \ lsefi normal part_gpt part_msdos read search search_fs_file search_fs_uuid \ search_label terminal terminfo tftp linux" |