diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 13:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 13:39:07 +0000 |
| commit | d69ab19701a142fb654cdecb3d4fda09e098d7a8 (patch) | |
| tree | 26ae3e192aa88f123c65a2190810385c581643a7 /kolla/image | |
| parent | d25ddf87f3f74c9889e303a9e139296fe70f04dc (diff) | |
| parent | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (diff) | |
| download | kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.tar.gz kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.zip | |
Merge "Remove Fedora support"
Diffstat (limited to 'kolla/image')
| -rw-r--r-- | kolla/image/build.py | 6 |
1 files changed, 1 insertions, 5 deletions
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': |