diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-04 15:26:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-04 15:26:24 +0000 |
| commit | 49445b68f8e195f4db7aebe972415d1d620665dc (patch) | |
| tree | be93023ffc76f3b6f63fa0557c48c476f6424f6f | |
| parent | 481636bc6dd6880dbc328d0bafc485dfebdabc7a (diff) | |
| parent | a04963a6abdf34a49ecb815d97de394d8c7a152b (diff) | |
| download | kolla-49445b68f8e195f4db7aebe972415d1d620665dc.tar.gz kolla-49445b68f8e195f4db7aebe972415d1d620665dc.zip | |
Merge "nova: use proper uefi package names under CentOS/RHEL 8"
| -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 #} |