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
---
 kolla/common/config.py    | 4 +---
 kolla/image/build.py      | 9 +--------
 kolla/tests/test_build.py | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'kolla')

diff --git a/kolla/common/config.py b/kolla/common/config.py
index c6d4e269a..67401d587 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -19,19 +19,17 @@ from oslo_config import types
 from kolla.version import version_info as version
 
 
-BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian']
+BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian']
 BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64']
 DEFAULT_BASE_TAGS = {
     'centos': '7',
     'rhel': '7',
-    'oraclelinux': '7-slim',
     'debian': 'buster',
     'ubuntu': '18.04',
 }
 DISTRO_RELEASE = {
     'centos': '7',
     'rhel': '7',
-    'oraclelinux': '7',
     'debian': 'buster',
     'ubuntu': '18.04',
 }
diff --git a/kolla/image/build.py b/kolla/image/build.py
index e1b43b789..0ad5cd6d3 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -123,9 +123,6 @@ UNBUILDABLE_IMAGES = {
     'centos': {
         "ovsdpdk",
     },
-    'oraclelinux': {
-        "ovsdpdk",
-    },
     'debian': {
         "bifrost-base",  # tries to install 'mysql-server' which is not in
                          # Debian 'buster'
@@ -173,10 +170,6 @@ UNBUILDABLE_IMAGES = {
         "zaqar",
     },
 
-    'oraclelinux+source': {
-        "bifrost-base",
-    },
-
     'ubuntu+binary': {
         "cloudkitty-base",
         "congress-base",
@@ -681,7 +674,7 @@ class KollaWorker(object):
                              conf.rpm_setup_config if repo_file is not None])
         self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
 
-        rh_base = ['centos', 'oraclelinux', 'rhel']
+        rh_base = ['centos', 'rhel']
         rh_type = ['source', 'binary', 'rdo', 'rhos']
         deb_base = ['ubuntu', 'debian']
         deb_type = ['source', 'binary']
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 72a35029f..ef309613b 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -283,7 +283,7 @@ class KollaWorkerTest(base.TestCase):
         self.mock_client = patcher.start()
 
     def test_supported_base_type(self):
-        rh_base = ['centos', 'oraclelinux', 'rhel']
+        rh_base = ['centos', 'rhel']
         rh_type = ['source', 'binary', 'rdo', 'rhos']
         deb_base = ['ubuntu', 'debian']
         deb_type = ['source', 'binary']
-- 
cgit v1.2.3