diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-30 16:26:08 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-30 16:28:48 +0100 |
| commit | a04963a6abdf34a49ecb815d97de394d8c7a152b (patch) | |
| tree | 61fc75d8c899ebdf2a9205c8ca2ed04bc21401ca /docker/nova | |
| parent | a68223412e6e3289173adca1af760157b25121c2 (diff) | |
| download | kolla-a04963a6abdf34a49ecb815d97de394d8c7a152b.tar.gz kolla-a04963a6abdf34a49ecb815d97de394d8c7a152b.zip | |
nova: use proper uefi package names under CentOS/RHEL 8
Change-Id: I92be17ef1ce0f81ab3f49433a0d1e688874ba64e
Diffstat (limited to 'docker/nova')
| -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 #} |