From fa8e174be6bc5b4d555258197938da9da40bfa81 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 18 Sep 2019 12:40:59 +0100
Subject: Remove support for OracleLinux

We have agreed to remove support for Oracle Linux.

http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html

Change-Id: I961dfba1aeef2c509ecdaf376dfe6928926ffb39
Depends-On: https://review.opendev.org/682858
---
 contrib/template-override/opendaylight-template-overrides.j2 | 4 ++--
 contrib/template-override/ovs-dpdk.j2                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'contrib')

diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2
index eeb76c782..76d93b24f 100644
--- a/contrib/template-override/opendaylight-template-overrides.j2
+++ b/contrib/template-override/opendaylight-template-overrides.j2
@@ -1,9 +1,9 @@
 {% extends parent_template %}
 
 {% block opendaylight_install %}
-  {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+  {% if base_package_type == 'rpm' %}
     {% set opendaylight_packages = ['java-1.8.0-openjdk'] %}
-  {% elif base_distro in ['ubuntu', 'debian'] %}
+  {% elif base_package_type == 'deb' %}
     {% set opendaylight_packages = ['openjdk-8-jre'] %}
   {% endif %}
 
diff --git a/contrib/template-override/ovs-dpdk.j2 b/contrib/template-override/ovs-dpdk.j2
index 42520022e..1bfac6456 100644
--- a/contrib/template-override/ovs-dpdk.j2
+++ b/contrib/template-override/ovs-dpdk.j2
@@ -4,7 +4,7 @@
 
 # install ovs from source
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
     {% set ovs_dpdk_packages = [
         'kernel-devel-$(uname -r)',
         'redhat-lsb-core',
@@ -22,7 +22,7 @@
         'crudini'
      ] %}
 
-{% elif base_distro in [ 'debian', 'ubuntu' ] %}
+{% elif base_package_type == 'deb' %}
 
     {% set ovs_dpdk_packages = [
         'linux-headers-$(uname -r)',
@@ -46,7 +46,7 @@
 
 {{ macros.install_packages(ovs_dpdk_packages | customizable("packages")) }}
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
 RUN mkdir -p /lib/modules/$(uname -r) \
     && ln -s /usr/src/kernels/$(uname -r) /lib/modules/$(uname -r)/build
 {% endif %}
-- 
cgit v1.2.3