diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-18 18:11:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-18 18:11:30 +0000 |
| commit | 827dcbc7df6ea426c0cd1841589db57cd65a46d6 (patch) | |
| tree | 7adefc6544371a8bd7e7da372b37a99ccfbbdd7b /kolla | |
| parent | 2241efb2eb61361c9291fd137250cb5e7719384d (diff) | |
| parent | fa8e174be6bc5b4d555258197938da9da40bfa81 (diff) | |
| download | kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.tar.gz kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.zip | |
Merge "Remove support for OracleLinux"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 9 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 2 |
3 files changed, 3 insertions, 12 deletions
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'] |