openstack/kolla
Code Issues Proposed changes

Merge "ubuntu: move to 20.04 Focal"

Browse Source
This commit is contained in:
Zuul 2020-08-10 10:31:52 +00:00 committed by Gerrit Code Review
commit 7f4a32e1a3
11 changed files with 89 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.d/base.yaml
View File

@ -32,10 +32,10 @@
label: centos-8 label: centos-8
- nodeset: - nodeset:
name: kolla-ubuntu-bionic name: kolla-ubuntu-focal
nodes: nodes:
- name: primary - name: primary
label: ubuntu-bionic label: ubuntu-focal
- nodeset: - nodeset:
name: kolla-debian-buster name: kolla-debian-buster
@ -56,10 +56,10 @@
label: debian-buster-arm64 label: debian-buster-arm64
- nodeset: - nodeset:
name: kolla-ubuntu-bionic-aarch64 name: kolla-ubuntu-focal-aarch64
nodes: nodes:
- name: primary - name: primary
label: ubuntu-bionic-arm64 label: ubuntu-focal-arm64
- job: - job:
name: kolla-base name: kolla-base

48
.zuul.d/ubuntu.yaml
View File

@ -4,32 +4,60 @@
jobs: jobs:
- kolla-build-ubuntu-binary - kolla-build-ubuntu-binary
- kolla-build-ubuntu-source - kolla-build-ubuntu-source
- kolla-ansible-ubuntu-source - kolla-ansible-ubuntu-source:
- kolla-ansible-ubuntu-binary vars:
- kolla-ansible-ubuntu-source-upgrade 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. # Test rabbitmq and mariadb in multinode ceph jobs.
- kolla-ansible-ubuntu-source-ceph-ansible: - kolla-ansible-ubuntu-source-ceph-ansible:
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-upgrade-ceph-ansible: - kolla-ansible-ubuntu-source-upgrade-ceph-ansible:
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-zun: - kolla-ansible-ubuntu-source-zun:
files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-ironic: - kolla-ansible-ubuntu-source-ironic:
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-swift: - kolla-ansible-ubuntu-source-swift:
files: ^docker/(base|openstack-base|glance|swift)/ files: ^docker/(base|openstack-base|glance|swift)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-mariadb: - kolla-ansible-ubuntu-source-mariadb:
files: ^docker/(base|mariadb)/ files: ^docker/(base|mariadb)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-masakari: - kolla-ansible-ubuntu-source-masakari:
files: ^docker/(base|masakari|openstack-base)/ files: ^docker/(base|masakari|openstack-base)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-linuxbridge: - kolla-ansible-ubuntu-source-linuxbridge:
files: ^docker/(base|neutron|openstack-base)/ files: ^docker/(base|neutron|openstack-base)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-ovn: - kolla-ansible-ubuntu-source-ovn:
files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-prometheus-efk: - kolla-ansible-ubuntu-source-prometheus-efk:
files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/ files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-kvm: - kolla-ansible-ubuntu-source-kvm:
files: ^docker/nova/ files: ^docker/nova/
vars:
kolla_python_version: 3.8
check-arm64: check-arm64:
jobs: jobs:
- kolla-build-ubuntu-source-aarch64 - kolla-build-ubuntu-source-aarch64
@ -37,8 +65,12 @@
queue: kolla queue: kolla
jobs: jobs:
- kolla-build-ubuntu-source - kolla-build-ubuntu-source
- kolla-ansible-ubuntu-source - kolla-ansible-ubuntu-source:
- kolla-ansible-ubuntu-source-upgrade vars:
kolla_python_version: 3.8
- kolla-ansible-ubuntu-source-upgrade:
vars:
kolla_python_version: 3.8
periodic: periodic:
jobs: jobs:
- kolla-publish-ubuntu-source - kolla-publish-ubuntu-source
@ -51,7 +83,7 @@
- job: - job:
name: kolla-build-ubuntu-binary name: kolla-build-ubuntu-binary
parent: kolla-base parent: kolla-base
nodeset: kolla-ubuntu-bionic nodeset: kolla-ubuntu-focal
voting: false voting: false
vars: vars:
base_distro: ubuntu base_distro: ubuntu
@ -69,7 +101,7 @@
- job: - job:
name: kolla-build-ubuntu-source name: kolla-build-ubuntu-source
parent: kolla-base parent: kolla-base
nodeset: kolla-ubuntu-bionic nodeset: kolla-ubuntu-focal
vars: vars:
base_distro: ubuntu base_distro: ubuntu
install_type: source install_type: source
@ -77,7 +109,7 @@
- job: - job:
name: kolla-build-ubuntu-source-aarch64 name: kolla-build-ubuntu-source-aarch64
parent: kolla-build-ubuntu-source parent: kolla-build-ubuntu-source
nodeset: kolla-ubuntu-bionic-aarch64 nodeset: kolla-ubuntu-focal-aarch64
voting: false voting: false
- job: - job:

2
doc/source/support_matrix.rst
View File

@ -25,7 +25,7 @@ Distribution Default base Default base tag
CentOS 8 centos 8 CentOS 8 centos 8
Debian Buster debian 10 Debian Buster debian 10
RHEL 8 rhel 8 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 The remainder of this document outlines which images are supported on which of

24
docker/base/sources.list.ubuntu
View File

@ -1,16 +1,16 @@
# For non-x86 architectures we use sources.list.ubuntu.<arch> # For non-x86 architectures we use sources.list.ubuntu.<arch>
# Default repos # Default repos
deb mirror://mirrors.ubuntu.com/mirrors.txt bionic main universe deb mirror://mirrors.ubuntu.com/mirrors.txt focal main universe
deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-updates main universe deb mirror://mirrors.ubuntu.com/mirrors.txt focal-updates main universe
deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-security 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 # 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 # We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch. # 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 # 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 # 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 #deb https://artifacts.elastic.co/packages/5.x/apt stable main
# InfluxDB repo # InfluxDB repo
#deb https://repos.influxdata.com/ubuntu bionic stable #deb https://repos.influxdata.com/ubuntu focal stable
# Grafana repo # Grafana repo
#deb https://packages.grafana.com/oss/deb stable main #deb https://packages.grafana.com/oss/deb stable main
# Fluentd repo # Fluentd repo
#deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib #deb http://packages.treasuredata.com/3/ubuntu/focal/ focal contrib
# Qdrouterd repo # Qdrouterd repo
#deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main #deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
# rabbitmq repo # rabbitmq repo
#deb https://dl.bintray.com/rabbitmq/debian/ bionic main #deb https://dl.bintray.com/rabbitmq/debian/ focal main
# erlang repo # 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 # 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 # 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

14
docker/base/sources.list.ubuntu.aarch64
View File

@ -1,14 +1,14 @@
# Default repos # Default repos
deb http://ports.ubuntu.com/ bionic main universe deb http://ports.ubuntu.com/ focal main universe
deb http://ports.ubuntu.com/ bionic-updates main universe deb http://ports.ubuntu.com/ focal-updates main universe
deb http://ports.ubuntu.com/ bionic-security main universe deb http://ports.ubuntu.com/ focal-security main universe
# Backports have a lower priority and must be explicitly installed to be used # 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 # We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch. # 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 # 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 # 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. # Here they stay in case someone needs them.
# rabbitmq repo # rabbitmq repo
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main #deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# Grafana repo # Grafana repo
#deb https://packages.grafana.com/oss/deb stable main #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 #deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
# MariaDB repo # 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

14
docker/base/sources.list.ubuntu.ppc64le
View File

@ -1,14 +1,14 @@
# Default repos # Default repos
deb http://ports.ubuntu.com/ bionic main universe deb http://ports.ubuntu.com/ focal main universe
deb http://ports.ubuntu.com/ bionic-updates main universe deb http://ports.ubuntu.com/ focal-updates main universe
deb http://ports.ubuntu.com/ bionic-security main universe deb http://ports.ubuntu.com/ focal-security main universe
# Backports have a lower priority and must be explicitly installed to be used # 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 # We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch. # 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 # 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 # 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. # Here they stay in case someone needs them.
# rabbitmq repo # rabbitmq repo
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main #deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# MariaDB repo # 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

15
docker/swift/swift-proxy-server/Dockerfile.j2
View File

@ -14,17 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-ceilometermiddleware' 'python3-ceilometermiddleware'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %} {% set swift_proxy_server_packages = [
{% set swift_proxy_server_packages = [ 'swift-proxy',
'swift-proxy', 'python3-ceilometermiddleware'
'python3-ceilometermiddleware' ] %}
] %}
{% else %}
{% set swift_proxy_server_packages = [
'swift-proxy',
'python-ceilometermiddleware'
] %}
{% endif %}
{% endif %} {% endif %}
{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}

4
kolla/common/config.py
View File

@ -25,13 +25,13 @@ DEFAULT_BASE_TAGS = {
'centos': '8', 'centos': '8',
'rhel': '8', 'rhel': '8',
'debian': '10', 'debian': '10',
'ubuntu': '18.04', 'ubuntu': '20.04',
} }
DISTRO_RELEASE = { DISTRO_RELEASE = {
'centos': '8', 'centos': '8',
'rhel': '8', 'rhel': '8',
'debian': '10', 'debian': '10',
'ubuntu': '18.04', 'ubuntu': '20.04',
} }
OPENSTACK_RELEASE = 'master' OPENSTACK_RELEASE = 'master'

2
kolla/image/build.py
View File

@ -699,7 +699,7 @@ class KollaWorker(object):
elif self.base in ['debian']: elif self.base in ['debian']:
self.conf.distro_python_version = "3.7" self.conf.distro_python_version = "3.7"
elif self.base in ['ubuntu']: elif self.base in ['ubuntu']:
self.conf.distro_python_version = "3.6" self.conf.distro_python_version = "3.8"
else: else:
# Assume worst # Assume worst
self.conf.distro_python_version = "3.6" self.conf.distro_python_version = "3.6"

19
kolla/template/repos.yaml
View File

@ -70,26 +70,27 @@ debian-aarch64:
ubuntu: ubuntu:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" 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" 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" 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" 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" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic 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" 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: ubuntu-aarch64:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" 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" 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" 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" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ 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: 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" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"

2
kolla/tests/test_build.py
View File

@ -549,7 +549,7 @@ class KollaWorkerTest(base.TestCase):
"""check distro_python_version for Ubuntu""" """check distro_python_version for Ubuntu"""
self.conf.set_override('base', 'ubuntu') self.conf.set_override('base', 'ubuntu')
kolla = build.KollaWorker(self.conf) 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): def test_build_distro_python_version_centos(self):
"""check distro_python_version for CentOS 8.0.1905""" """check distro_python_version for CentOS 8.0.1905"""