aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-05 16:53:34 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-09-27 07:40:06 +0000
commit878b00013b01e3d02a704ce7c9fac1629cd1a705 (patch)
tree218b3a4d1470a0c55006577d912d5369d60a8fb5 /kolla
parentea3ed3f9332dbd7f369ca49806ee04000881c3c7 (diff)
downloadkolla-878b00013b01e3d02a704ce7c9fac1629cd1a705.tar.gz
kolla-878b00013b01e3d02a704ce7c9fac1629cd1a705.zip
Move to CentOS Stream 9
OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go. This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is planned as final solution. CI moved to CentOS Stream 9 nodes. Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715 Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py10
-rwxr-xr-xkolla/image/build.py12
-rw-r--r--kolla/template/repos.yaml14
-rw-r--r--kolla/tests/test_build.py5
-rw-r--r--kolla/tests/test_methods.py4
5 files changed, 24 insertions, 21 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 773e7c11c..d6b5e1e0f 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -24,22 +24,20 @@ from kolla.version import version_info as version
BASE_OS_DISTRO = ['centos', 'debian', 'ubuntu']
BASE_ARCH = ['x86_64', 'aarch64']
DEFAULT_BASE_TAGS = {
- 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'},
+ 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'},
'debian': {'name': 'debian', 'tag': 'bullseye'},
'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
}
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
DISTRO_PRETTY_NAME = {
- 'centos': 'CentOS Stream 8',
+ 'centos': 'CentOS Stream 9',
'debian': 'Debian GNU/Linux 11 (bullseye)',
'ubuntu': 'Ubuntu 22.04',
}
OPENSTACK_RELEASE = 'master'
# This is noarch repository so we will use it on all architectures
-DELOREAN = "https://trunk.rdoproject.org/centos8-yoga/" \
- "consistent/delorean.repo"
-DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-yoga/" \
+DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \
"delorean-deps.repo"
INSTALL_TYPE_CHOICES = ['source']
@@ -270,7 +268,7 @@ _BASE_OPTS = [
help=('Set the package type of the distro. If not set then '
'the packaging type is set to "rpm" if a RHEL based '
'distro and "deb" if a Debian based distro.')),
- cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
+ cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS],
help=('Comma separated list of .rpm or .repo file(s) '
'or URL(s) to install before building containers')),
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 25eb38a74..48e5d9731 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -87,11 +87,19 @@ UNBUILDABLE_IMAGES = {
"skydive-base", # no aarch64 binary
},
+ # Issues for SHA1 keys:
+ # https://github.com/elastic/elasticsearch/issues/85876
+ # https://github.com/grafana/grafana/issues/41036
'centos': {
+ "elasticsearch", # SHA1 gpg key
+ "grafana", # SHA1 gpg key
"hacluster-pcs", # Missing crmsh package
+ "kibana", # SHA1 gpg key
+ "logstash", # SHA1 gpg key
"nova-spicehtml5proxy", # Missing spicehtml5 package
"ovsdpdk", # Not supported on CentOS
- "tgtd", # Not supported on CentOS 8
+ "proxysql", # no binary package
+ "tgtd", # Not supported on CentOS
},
'debian': {
@@ -623,7 +631,7 @@ class KollaWorker(object):
self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
if self.base in ['centos']:
- self.conf.distro_python_version = "3.6"
+ self.conf.distro_python_version = "3.9"
self.distro_package_manager = 'dnf'
self.base_package_type = 'rpm'
elif self.base in ['debian']:
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 68f53c826..916b35da2 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -1,13 +1,13 @@
---
centos:
- ceph: "centos-ceph-pacific"
+ ceph: "centos-ceph-quincy"
+ crb: "crb"
elasticsearch: "elasticsearch-kibana-logstash-7.x"
epel: "epel"
- epel-modular: "epel-modular"
erlang: "rabbitmq_rabbitmq-erlang"
extras: "extras"
grafana: "grafana"
- hacluster: "ha"
+ hacluster: "highavailability"
haproxy: "centos-nfv-extras"
influxdb: "influxdb"
kibana: "elasticsearch-kibana-logstash-7.x"
@@ -15,27 +15,25 @@ centos:
mariadb: "mariadb"
openvswitch: "centos-nfv-openvswitch"
opstools: "centos-opstools"
- powertools: "powertools"
proxysql: "proxysql"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
centos-aarch64:
- ceph: "centos-ceph-pacific"
+ ceph: "centos-ceph-quincy"
+ crb: "crb"
elasticsearch: "elasticsearch-kibana-logstash-7.x"
epel: "epel"
- epel-modular: "epel-modular"
erlang: "erlang-solutions"
extras: "extras"
grafana: "grafana"
- hacluster: "ha"
+ hacluster: "highavailability"
haproxy: "centos-nfv-extras"
kibana: "elasticsearch-kibana-logstash-7.x"
logstash: "elasticsearch-kibana-logstash-7.x"
mariadb: "mariadb"
openvswitch: "centos-nfv-openvswitch"
opstools: "centos-opstools"
- powertools: "powertools"
proxysql: "proxysql"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index ab6e37432..bf9896465 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -529,11 +529,10 @@ class KollaWorkerTest(base.TestCase):
self.assertEqual('3.10', kolla.distro_python_version)
def test_build_distro_python_version_centos(self):
- """check distro_python_version for CentOS 8.0.1905"""
+ """check distro_python_version for CentOS Stream 9"""
self.conf.set_override('base', 'centos')
- self.conf.set_override('base_tag', '8.0.1905')
kolla = build.KollaWorker(self.conf)
- self.assertEqual('3.6', kolla.distro_python_version)
+ self.assertEqual('3.9', kolla.distro_python_version)
def test_build_distro_package_manager(self):
"""check distro_package_manager conf value is taken"""
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py
index 16b40c17f..d98fa8825 100644
--- a/kolla/tests/test_methods.py
+++ b/kolla/tests/test_methods.py
@@ -55,7 +55,7 @@ class MethodsTest(base.TestCase):
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
'enable')
expectCmd = 'RUN dnf config-manager --enable grafana '
- expectCmd += '--enable centos-ceph-pacific || true'
+ expectCmd += '--enable centos-ceph-quincy || true'
self.assertEqual(expectCmd, result)
def test_enable_repos_debian(self):
@@ -145,7 +145,7 @@ class MethodsTest(base.TestCase):
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
'disable')
expectCmd = 'RUN dnf config-manager --disable grafana '
- expectCmd += '--disable centos-ceph-pacific || true'
+ expectCmd += '--disable centos-ceph-quincy || true'
self.assertEqual(expectCmd, result)
# NOTE(hrw): there is no disabling of repos for Debian/Ubuntu