From 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 3 Nov 2016 10:37:21 +0100 Subject: Remove Fedora support Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044 --- kolla/image/build.py | 6 +----- kolla/tests/test_build.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'kolla') diff --git a/kolla/image/build.py b/kolla/image/build.py index 231824e85..d5b7e07db 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -514,7 +514,7 @@ class KollaWorker(object): rpm_setup_config = filter(None, conf.rpm_setup_config) self.rpm_setup = self.build_rpm_setup(rpm_setup_config) - rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel'] + rh_base = ['centos', 'oraclelinux', 'rhel'] rh_type = ['source', 'binary', 'rdo', 'rhos'] deb_base = ['ubuntu', 'debian'] deb_type = ['source', 'binary'] @@ -525,10 +525,6 @@ class KollaWorker(object): '{} is unavailable for {}'.format(self.install_type, self.base) ) - if self.base == 'fedora': - LOG.warning('Fedora images are deprecated since Newton and will ' - 'be removed in the future') - if self.install_type == 'binary': self.install_metatype = 'rdo' elif self.install_type == 'source': diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 515aa1ddd..b0a46a988 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -152,7 +152,7 @@ class KollaWorkerTest(base.TestCase): self.images = [image, image_child] def test_supported_base_type(self): - rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel'] + rh_base = ['centos', 'oraclelinux', 'rhel'] rh_type = ['source', 'binary', 'rdo', 'rhos'] deb_base = ['ubuntu', 'debian'] deb_type = ['source', 'binary'] -- cgit v1.2.3