aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.zuul.d/base.yaml8
-rw-r--r--.zuul.d/ubuntu.yaml48
-rw-r--r--doc/source/support_matrix.rst2
-rw-r--r--docker/base/sources.list.ubuntu24
-rw-r--r--docker/base/sources.list.ubuntu.aarch6414
-rw-r--r--docker/base/sources.list.ubuntu.ppc64le14
-rw-r--r--docker/swift/swift-proxy-server/Dockerfile.j215
-rwxr-xr-xkolla/common/config.py4
-rwxr-xr-xkolla/image/build.py2
-rw-r--r--kolla/template/repos.yaml19
-rw-r--r--kolla/tests/test_build.py2
11 files changed, 89 insertions, 63 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index fb2310e58..e7ed3e5ff 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -32,10 +32,10 @@
label: centos-8
- nodeset:
- name: kolla-ubuntu-bionic
+ name: kolla-ubuntu-focal
nodes:
- name: primary
- label: ubuntu-bionic
+ label: ubuntu-focal
- nodeset:
name: kolla-debian-buster
@@ -56,10 +56,10 @@
label: debian-buster-arm64
- nodeset:
- name: kolla-ubuntu-bionic-aarch64
+ name: kolla-ubuntu-focal-aarch64
nodes:
- name: primary
- label: ubuntu-bionic-arm64
+ label: ubuntu-focal-arm64
- job:
name: kolla-base
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index 2d74c2020..92213a08f 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -4,32 +4,60 @@
jobs:
- kolla-build-ubuntu-binary
- kolla-build-ubuntu-source
- - kolla-ansible-ubuntu-source
- - kolla-ansible-ubuntu-binary
- - kolla-ansible-ubuntu-source-upgrade
+ - kolla-ansible-ubuntu-source:
+ vars:
+ kolla_python_version: 3.8
+ - kolla-ansible-ubuntu-binary:
+ vars:
+ kolla_python_version: 3.8
+ - kolla-ansible-ubuntu-source-upgrade:
+ vars:
+ kolla_python_version: 3.8
# Test rabbitmq and mariadb in multinode ceph jobs.
- kolla-ansible-ubuntu-source-ceph-ansible:
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-upgrade-ceph-ansible:
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-zun:
files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-ironic:
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-swift:
files: ^docker/(base|openstack-base|glance|swift)/
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-mariadb:
files: ^docker/(base|mariadb)/
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-masakari:
files: ^docker/(base|masakari|openstack-base)/
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-linuxbridge:
files: ^docker/(base|neutron|openstack-base)/
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-ovn:
files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-prometheus-efk:
files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
+ vars:
+ kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-kvm:
files: ^docker/nova/
+ vars:
+ kolla_python_version: 3.8
check-arm64:
jobs:
- kolla-build-ubuntu-source-aarch64
@@ -37,8 +65,12 @@
queue: kolla
jobs:
- kolla-build-ubuntu-source
- - kolla-ansible-ubuntu-source
- - kolla-ansible-ubuntu-source-upgrade
+ - kolla-ansible-ubuntu-source:
+ vars:
+ kolla_python_version: 3.8
+ - kolla-ansible-ubuntu-source-upgrade:
+ vars:
+ kolla_python_version: 3.8
periodic:
jobs:
- kolla-publish-ubuntu-source
@@ -51,7 +83,7 @@
- job:
name: kolla-build-ubuntu-binary
parent: kolla-base
- nodeset: kolla-ubuntu-bionic
+ nodeset: kolla-ubuntu-focal
voting: false
vars:
base_distro: ubuntu
@@ -69,7 +101,7 @@
- job:
name: kolla-build-ubuntu-source
parent: kolla-base
- nodeset: kolla-ubuntu-bionic
+ nodeset: kolla-ubuntu-focal
vars:
base_distro: ubuntu
install_type: source
@@ -77,7 +109,7 @@
- job:
name: kolla-build-ubuntu-source-aarch64
parent: kolla-build-ubuntu-source
- nodeset: kolla-ubuntu-bionic-aarch64
+ nodeset: kolla-ubuntu-focal-aarch64
voting: false
- job:
diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst
index 9d920ea96..9c1d13af2 100644
--- a/doc/source/support_matrix.rst
+++ b/doc/source/support_matrix.rst
@@ -25,7 +25,7 @@ Distribution Default base Default base tag
CentOS 8 centos 8
Debian Buster debian 10
RHEL 8 rhel 8
-Ubuntu Bionic ubuntu 18.04
+Ubuntu Focal ubuntu 20.04
============= ============ ================
The remainder of this document outlines which images are supported on which of
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index d664f491b..288deb16e 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -1,16 +1,16 @@
# For non-x86 architectures we use sources.list.ubuntu.<arch>
# Default repos
-deb mirror://mirrors.ubuntu.com/mirrors.txt bionic main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-updates main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-security main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt focal main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt focal-updates main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt focal-security main universe
# Backports have a lower priority and must be explicitly installed to be used
-deb http://archive.ubuntu.com/ubuntu/ bionic-backports main universe
+deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main
# NOTE(hrw): repositories below are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
@@ -22,25 +22,25 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
#deb https://artifacts.elastic.co/packages/5.x/apt stable main
# InfluxDB repo
-#deb https://repos.influxdata.com/ubuntu bionic stable
+#deb https://repos.influxdata.com/ubuntu focal stable
# Grafana repo
#deb https://packages.grafana.com/oss/deb stable main
# Fluentd repo
-#deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib
+#deb http://packages.treasuredata.com/3/ubuntu/focal/ focal contrib
# Qdrouterd repo
-#deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main
+#deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
# rabbitmq repo
-#deb https://dl.bintray.com/rabbitmq/debian/ bionic main
+#deb https://dl.bintray.com/rabbitmq/debian/ focal main
# erlang repo
-#deb https://dl.bintray.com/rabbitmq-erlang/debian/ bionic erlang
+#deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang
# erlang repo - aarch64 only
-#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./
+#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./
# MariaDB repo
-#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
+#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64
index cb18d4dcd..5f6c8f435 100644
--- a/docker/base/sources.list.ubuntu.aarch64
+++ b/docker/base/sources.list.ubuntu.aarch64
@@ -1,14 +1,14 @@
# Default repos
-deb http://ports.ubuntu.com/ bionic main universe
-deb http://ports.ubuntu.com/ bionic-updates main universe
-deb http://ports.ubuntu.com/ bionic-security main universe
+deb http://ports.ubuntu.com/ focal main universe
+deb http://ports.ubuntu.com/ focal-updates main universe
+deb http://ports.ubuntu.com/ focal-security main universe
# Backports have a lower priority and must be explicitly installed to be used
-deb http://ports.ubuntu.com/ bionic-backports main universe
+deb http://ports.ubuntu.com/ focal-backports main universe
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main
# NOTE(hrw): repositories below are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
@@ -17,7 +17,7 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
# Here they stay in case someone needs them.
# rabbitmq repo
-#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# Grafana repo
#deb https://packages.grafana.com/oss/deb stable main
@@ -26,4 +26,4 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
#deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
# MariaDB repo
-#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
+#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le
index 6500d7bd3..3dd0d5e7d 100644
--- a/docker/base/sources.list.ubuntu.ppc64le
+++ b/docker/base/sources.list.ubuntu.ppc64le
@@ -1,14 +1,14 @@
# Default repos
-deb http://ports.ubuntu.com/ bionic main universe
-deb http://ports.ubuntu.com/ bionic-updates main universe
-deb http://ports.ubuntu.com/ bionic-security main universe
+deb http://ports.ubuntu.com/ focal main universe
+deb http://ports.ubuntu.com/ focal-updates main universe
+deb http://ports.ubuntu.com/ focal-security main universe
# Backports have a lower priority and must be explicitly installed to be used
-deb http://ports.ubuntu.com/ bionic-backports main universe
+deb http://ports.ubuntu.com/ focal-backports main universe
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main
# NOTE(hrw): repositories below are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
@@ -17,7 +17,7 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
# Here they stay in case someone needs them.
# rabbitmq repo
-#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# MariaDB repo
-#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
+#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 8a2b903ed..4d57b32e3 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -14,17 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-ceilometermiddleware'
] %}
{% elif base_package_type == 'deb' %}
- {% if base_distro == 'debian' %}
- {% set swift_proxy_server_packages = [
- 'swift-proxy',
- 'python3-ceilometermiddleware'
- ] %}
- {% else %}
- {% set swift_proxy_server_packages = [
- 'swift-proxy',
- 'python-ceilometermiddleware'
- ] %}
- {% endif %}
+ {% set swift_proxy_server_packages = [
+ 'swift-proxy',
+ 'python3-ceilometermiddleware'
+ ] %}
{% endif %}
{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 76f2fd577..5d8b586a6 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -25,13 +25,13 @@ DEFAULT_BASE_TAGS = {
'centos': '8',
'rhel': '8',
'debian': '10',
- 'ubuntu': '18.04',
+ 'ubuntu': '20.04',
}
DISTRO_RELEASE = {
'centos': '8',
'rhel': '8',
'debian': '10',
- 'ubuntu': '18.04',
+ 'ubuntu': '20.04',
}
OPENSTACK_RELEASE = 'master'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index ca5a0f0cd..70818f60e 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -699,7 +699,7 @@ class KollaWorker(object):
elif self.base in ['debian']:
self.conf.distro_python_version = "3.7"
elif self.base in ['ubuntu']:
- self.conf.distro_python_version = "3.6"
+ self.conf.distro_python_version = "3.8"
else:
# Assume worst
self.conf.distro_python_version = "3.6"
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 769175c55..416b91cef 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -70,26 +70,27 @@ debian-aarch64:
ubuntu:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
- erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ bionic erlang"
+ erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
- influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
+ influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
- mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
- qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main"
+ mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
+ qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
+ # NOTE(hrw): upstream uses bionic repo for focal
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
- td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib"
+ td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
ubuntu-aarch64:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
- erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./"
+ erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
- influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
+ influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
- td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib"
+ td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
ubuntu-ppc64le:
- mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
+ mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index ad5e47600..4b870a73a 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -549,7 +549,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.6', kolla.distro_python_version)
+ self.assertEqual('3.8', kolla.distro_python_version)
def test_build_distro_python_version_centos(self):
"""check distro_python_version for CentOS 8.0.1905"""
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 19:44:21 +0000