diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-30 16:26:08 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-24 13:48:18 +0000 |
| commit | ad00caaf9341bb58fd73969782a3f89b8189fb94 (patch) | |
| tree | e04c96ed939f1ae89c3bb03432a97953e88c2db4 /docker | |
| parent | ea8f03da6efe48665d56fdefd8aac37f9dee145d (diff) | |
| download | kolla-ad00caaf9341bb58fd73969782a3f89b8189fb94.tar.gz kolla-ad00caaf9341bb58fd73969782a3f89b8189fb94.zip | |
nova: use proper uefi package names under CentOS/RHEL 8
Change-Id: I92be17ef1ce0f81ab3f49433a0d1e688874ba64e
(cherry picked from commit a04963a6abdf34a49ecb815d97de394d8c7a152b)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index da379662c..b3ec434b1 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -20,12 +20,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_base_packages = nova_base_packages + [ 'OVMF' ] %} + {% else %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-ovmf' + ] %} {% endif %} {% elif base_arch == 'aarch64' %} {% if base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ 'AAVMF' ] %} + {% else %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-aarch64' + ] %} {% endif %} {% elif base_arch == 'ppc64le' %} {# NOTE(Jeffrey4l): no packages for ppc64le #} @@ -65,12 +73,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_base_packages = nova_base_packages + [ 'OVMF' ] %} + {% else %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-ovmf' + ] %} {% endif %} {% elif base_arch == 'aarch64' %} {% if base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ 'AAVMF' ] %} + {% else %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-aarch64' + ] %} {% endif %} {% elif base_arch == 'ppc64le' %} {# NOTE(Jeffrey4l): no packages for ppc64le #} |