aboutsummaryrefslogtreecommitdiff
path: root/kolla/common
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-09 17:44:54 +0100
committerMark Goddard <mark@stackhpc.com>2020-04-15 09:32:06 +0000
commit53443c5c712f4ec23b859105e94bcd90abc27762 (patch)
tree5bc6d8db4c65519e16d231b55f574e813e29da4b /kolla/common
parenta176c6e080be2e71829e8ca5e8b330fdda70038a (diff)
downloadkolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz
kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'kolla/common')
-rwxr-xr-xkolla/common/config.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index c086b6b15..2746fddea 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -13,7 +13,6 @@
import itertools
import os
-from distutils.version import LooseVersion
from oslo_config import cfg
from oslo_config import types
@@ -34,17 +33,12 @@ DISTRO_RELEASE = {
'debian': '10',
'ubuntu': '18.04',
}
-# NOTE(mgoddard): The default release is set to 'train' for CentOS/RHEL 7 due
-# to master dropping support for Python 2.
OPENSTACK_RELEASE = 'master'
# This is noarch repository so we will use it on all architectures
-DELOREAN = \
- "https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo"
-DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo"
-DELOREAN_CENTOS8 = "https://trunk.rdoproject.org/centos8-master/" \
+DELOREAN = "https://trunk.rdoproject.org/centos8-master/" \
"consistent/delorean.repo"
-DELOREAN_DEPS_CENTOS8 = "https://trunk.rdoproject.org/centos8-master/" \
+DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-master/" \
"delorean-deps.repo"
INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
@@ -1242,15 +1236,6 @@ def parse(conf, args, usage=None, prog=None,
# NOTE(jeffrey4l): set the default base tag based on the
# base option
conf.set_default('base_tag', DEFAULT_BASE_TAGS.get(conf.base))
- # TODO(mgoddard): Remove this 'if' when CentOS 7 is no longer supported.
- if conf.base in ['centos', 'rhel']:
- if LooseVersion(conf.base_tag) >= LooseVersion('8'):
- # Use CentOS 8 Delorean repos.
- conf.set_default('rpm_setup_config', [DELOREAN_CENTOS8,
- DELOREAN_DEPS_CENTOS8])
- else:
- # Use Train packages on CentOS 7 due to python 2 drop.
- conf.set_default('openstack_release', 'train')
prefix = '' if conf.openstack_release == 'master' else 'stable-'
openstack_branch = '{}{}'.format(prefix, conf.openstack_release)
conf.set_default('openstack_branch', openstack_branch)