aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2022-04-27 15:47:41 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-07-27 11:27:01 +0200
commit9f25aac18a31920c2f2f6630b35f3f734f03dcf4 (patch)
treea837f3fcb359a5f0f0726d15d8ad1d777e56262a /kolla
parentdc55bdb5eee7c41660c7ef7a5bd5064d95f003f4 (diff)
downloadkolla-9f25aac18a31920c2f2f6630b35f3f734f03dcf4.tar.gz
kolla-9f25aac18a31920c2f2f6630b35f3f734f03dcf4.zip
Move to Ubuntu Jammy (22.04)
mariadb - downloads.mariadb.com doesn't have jammy version, should be there soon - using Ubuntu provided version for now telegraf/collectd - collectd packages missing in Jammy - marked as unbuildable monasca - requires new librdkafka, no wheel for Python 3.10 for now Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/846070 Change-Id: I11b4fbcaba165824252902d0270ce1dbbc3d6e9d
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py4
-rwxr-xr-xkolla/image/build.py8
-rw-r--r--kolla/template/repos.yaml40
-rw-r--r--kolla/tests/test_build.py2
4 files changed, 19 insertions, 35 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index f4ef4925a..773e7c11c 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -26,13 +26,13 @@ BASE_ARCH = ['x86_64', 'aarch64']
DEFAULT_BASE_TAGS = {
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'},
'debian': {'name': 'debian', 'tag': 'bullseye'},
- 'ubuntu': {'name': 'ubuntu', 'tag': '20.04'},
+ 'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
}
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
DISTRO_PRETTY_NAME = {
'centos': 'CentOS Stream 8',
'debian': 'Debian GNU/Linux 11 (bullseye)',
- 'ubuntu': 'Ubuntu 20.04',
+ 'ubuntu': 'Ubuntu 22.04',
}
OPENSTACK_RELEASE = 'master'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 4390af9b9..92a3f3d31 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -99,10 +99,14 @@ UNBUILDABLE_IMAGES = {
},
'ubuntu': {
+ "collectd", # Missing collectd-core package
+ "monasca-base", # Requires new librdkafka, no wheels py3.10
+ "telegraf", # Missing collectd-core package
},
'ubuntu+aarch64': {
- "kibana", # no binary package
+ "barbican-base", # https://github.com/unbit/uwsgi/issues/2434
+ "kibana", # no binary package
},
'centos+aarch64': {
@@ -635,7 +639,7 @@ class KollaWorker(object):
self.distro_package_manager = 'apt'
self.base_package_type = 'deb'
elif self.base in ['ubuntu']:
- self.conf.distro_python_version = "3.8"
+ self.conf.distro_python_version = "3.10"
self.distro_package_manager = 'apt'
self.base_package_type = 'deb'
else:
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 79d4c3e88..051d0722f 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -152,7 +152,7 @@ ubuntu:
gpg_key: "elasticsearch.asc"
erlang:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
- suite: "focal"
+ suite: "jammy"
component: "main"
gpg_key: "erlang.gpg"
grafana:
@@ -160,14 +160,9 @@ ubuntu:
suite: "stable"
component: "main"
gpg_key: "grafana.asc"
- haproxy:
- url: "http://ppa.launchpad.net/vbernat/haproxy-2.2/ubuntu"
- suite: "focal"
- component: "main"
- gpg_key: "haproxy.gpg"
influxdb:
url: "https://repos.influxdata.com/ubuntu"
- suite: "focal"
+ suite: "jammy"
component: "stable"
gpg_key: "influxdb.asc"
logstash:
@@ -180,19 +175,14 @@ ubuntu:
suite: "stable"
component: "main"
gpg_key: "elasticsearch.asc"
- mariadb:
- url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
- suite: "focal"
- component: "main"
- gpg_key: "mariadb.gpg"
rabbitmq:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu"
- suite: "focal"
+ suite: "jammy"
component: "main"
gpg_key: "rabbitmq.gpg"
td-agent:
- url: "http://packages.treasuredata.com/4/ubuntu/focal/"
- suite: "focal"
+ url: "http://packages.treasuredata.com/4/ubuntu/jammy/"
+ suite: "jammy"
component: "contrib"
gpg_key: "treasuredata.asc"
proxysql:
@@ -209,7 +199,7 @@ ubuntu-aarch64:
gpg_key: "elasticsearch.asc"
erlang:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
- suite: "focal"
+ suite: "jammy"
component: "main"
gpg_key: "erlang.gpg"
grafana:
@@ -217,14 +207,9 @@ ubuntu-aarch64:
suite: "stable"
component: "main"
gpg_key: "grafana.asc"
- haproxy:
- url: "http://ppa.launchpad.net/vbernat/haproxy-2.2/ubuntu"
- suite: "focal"
- component: "main"
- gpg_key: "haproxy.gpg"
influxdb:
url: "https://repos.influxdata.com/ubuntu"
- suite: "focal"
+ suite: "jammy"
component: "stable"
gpg_key: "influxdb.asc"
logstash:
@@ -232,19 +217,14 @@ ubuntu-aarch64:
suite: "stable"
component: "main"
gpg_key: "elasticsearch.asc"
- mariadb:
- url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
- suite: "focal"
- component: "main"
- gpg_key: "mariadb.gpg"
rabbitmq:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu"
- suite: "focal"
+ suite: "jammy"
component: "main"
gpg_key: "rabbitmq.gpg"
td-agent:
- url: "http://packages.treasuredata.com/4/ubuntu/focal/"
- suite: "focal"
+ url: "http://packages.treasuredata.com/4/ubuntu/jammy/"
+ suite: "jammy"
component: "contrib"
gpg_key: "treasuredata.asc"
proxysql:
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 78be9c775..9e44d1bc6 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -542,7 +542,7 @@ class KollaWorkerTest(base.TestCase):
"""check distro_python_version for Ubuntu"""
self.conf.set_override('base', 'ubuntu')
kolla = build.KollaWorker(self.conf)
- self.assertEqual('3.8', kolla.distro_python_version)
+ 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"""