aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-base/Dockerfile.j28
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j22
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 79b826dc9..da379662c 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -16,13 +16,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% if base_arch == 'x86_64' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+ {% if base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [
'OVMF'
] %}
{% endif %}
{% elif base_arch == 'aarch64' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+ {% if base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [
'AAVMF'
] %}
@@ -61,13 +61,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch'
] %}
{% if base_arch == 'x86_64' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+ {% if base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [
'OVMF'
] %}
{% endif %}
{% elif base_arch == 'aarch64' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+ {% if base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [
'AAVMF'
] %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index fb75e443a..9fb812395 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch',
'trousers'
] %}
- {% if base_distro in ['centos', 'oraclelinux'] %}
+ {% if base_distro in ['centos'] %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-kvm-ev'
] %}