From fc89e57c1cad910dc9f2f01a2ec3c6c36051c8bc Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 4 Feb 2021 17:06:28 +0100
Subject: get rid of traces of CentOS 7 support

Change-Id: I4d20f23a9b26364943bf967908255d82c8f6621b
---
 docker/nova/nova-libvirt/Dockerfile.j2 | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'docker/nova/nova-libvirt')

diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 794d903eb..5613d9d9c 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -26,25 +26,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'trousers'
     ] %}
     {% if base_arch == 'x86_64' %}
-        {% if base_distro_tag.startswith('7') %}
-            {% set nova_libvirt_packages = nova_libvirt_packages + [
-                'OVMF'
-            ] %}
-        {% else %}
-            {% set nova_libvirt_packages = nova_libvirt_packages + [
-                'edk2-ovmf'
-            ] %}
-        {% endif %}
+        {% set nova_libvirt_packages = nova_libvirt_packages + [
+            'edk2-ovmf'
+        ] %}
     {% elif base_arch == 'aarch64' %}
-        {% if base_distro_tag.startswith('7') %}
-            {% set nova_libvirt_packages = nova_libvirt_packages + [
-                'AAVMF'
-            ] %}
-        {% else %}
-            {% set nova_libvirt_packages = nova_libvirt_packages + [
-                'edk2-aarch64'
-            ] %}
-        {% endif %}
+        {% set nova_libvirt_packages = nova_libvirt_packages + [
+            'edk2-aarch64'
+        ] %}
     {% endif %}
 
 {% elif base_package_type == 'deb' %}
-- 
cgit v1.2.3