openstack
/
kolla
Code Issues Proposed changes

Drop CentOS Linux 8 image builds 

Included patch:

Remove missing collectd packages

Since CentOS Linux 8 repository retirement from
CentOS mirrors - we need to use CentOS Stream 8
version of Opstools repo.

Listed below packages are missing from the repo,
and according to the maintainer dpdk_telemetry is
not going to show up at all (it's basically dead).

The rest of the packages might show up at a later
stage - but it's not a priority for the maintainer.

- collectd-dpdk_telemetry
- collectd-libpod-stats
- collectd-sensubility
- python3-sqlalchemy-collectd

(cherry picked from commit 405fca90f2)

Change-Id: I95ea4a66a80bf035f8bd1180790c7e0c85d759ed
This commit is contained in:
Michal Nasiadka 2022-02-03 10:19:40 +01:00
parent 02f5222b0c
commit 07f5199963
8 changed files with 24 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
.zuul.d/centos.yaml
View File

@ -2,8 +2,6 @@
- project:
check:
jobs:
- kolla-build-centos8-binary
- kolla-build-centos8-source
- kolla-build-centos8s-binary
- kolla-build-centos8s-source
- kolla-ansible-centos8s-source
@ -11,36 +9,27 @@
- kolla-ansible-centos8s-source-upgrade
check-arm64:
jobs:
- kolla-build-centos8-source-aarch64
- kolla-build-centos8s-source-aarch64
gate:
queue: kolla
jobs:
- kolla-build-centos8-source
- kolla-build-centos8s-source
- kolla-ansible-centos8s-source
- kolla-ansible-centos8s-source-upgrade
periodic:
jobs:
- kolla-publish-centos8-source-quay
- kolla-publish-centos8-binary-quay
- kolla-publish-centos8s-source-quay
- kolla-publish-centos8s-binary-quay
periodic-weekly:
jobs:
- kolla-publish-centos8-source-dockerhub
- kolla-publish-centos8-binary-dockerhub
- kolla-publish-centos8s-source-dockerhub
- kolla-publish-centos8s-binary-dockerhub
release:
jobs:
- kolla-publish-centos8-source-dockerhub
- kolla-publish-centos8-binary-dockerhub
- kolla-publish-centos8s-source-dockerhub
- kolla-publish-centos8s-binary-dockerhub
experimental:
jobs:
- kolla-build-no-infra-wheels-centos8-source
- kolla-ansible-centos8s-source-bifrost:
files: ^docker\/(base|bifrost|openstack-base)\/.*
# Test rabbitmq & mariadb changes in multinode ceph jobs.
@ -67,15 +56,6 @@
- kolla-ansible-centos8s-source-kvm:
files: ^docker/nova/
- job:
name: kolla-build-centos8-binary
parent: kolla-base
nodeset: kolla-centos8-stream
voting: false
vars:
base_distro: centos
install_type: binary
- job:
name: kolla-build-centos8s-binary
parent: kolla-base
@ -87,17 +67,6 @@
base_tag: stream8
install_type: binary
- job:
name: kolla-publish-centos8-binary-dockerhub
parent: kolla-build-centos8-binary
post-run: tests/playbooks/publish.yml
vars:
publisher: true
kolla_registry: dockerhub
kolla_namespace: kolla
secrets:
- kolla_dockerhub_creds
- job:
name: kolla-publish-centos8s-binary-dockerhub
parent: kolla-build-centos8s-binary
@ -109,17 +78,6 @@
secrets:
- kolla_dockerhub_creds
- job:
name: kolla-publish-centos8-binary-quay
parent: kolla-build-centos8-binary
post-run: tests/playbooks/publish.yml
vars:
publisher: true
kolla_registry: quay.io
kolla_namespace: openstack.kolla
secrets:
- kolla_quay_io_creds
- job:
name: kolla-publish-centos8s-binary-quay
parent: kolla-build-centos8s-binary
@ -131,14 +89,6 @@
secrets:
- kolla_quay_io_creds
- job:
name: kolla-build-centos8-source
parent: kolla-base
nodeset: kolla-centos8-stream
vars:
base_distro: centos
install_type: source
- job:
name: kolla-build-centos8s-source
parent: kolla-base
@ -149,29 +99,12 @@
base_tag: stream8
install_type: source
- job:
name: kolla-build-centos8-source-aarch64
parent: kolla-build-centos8-source
nodeset: kolla-centos8-stream-aarch64
voting: false
- job:
name: kolla-build-centos8s-source-aarch64
parent: kolla-build-centos8s-source
nodeset: kolla-centos8-stream-aarch64
voting: false
- job:
name: kolla-publish-centos8-source-dockerhub
parent: kolla-build-centos8-source
post-run: tests/playbooks/publish.yml
vars:
publisher: true
kolla_registry: dockerhub
kolla_namespace: kolla
secrets:
- kolla_dockerhub_creds
- job:
name: kolla-publish-centos8s-source-dockerhub
parent: kolla-build-centos8s-source
@ -183,17 +116,6 @@
secrets:
- kolla_dockerhub_creds
- job:
name: kolla-publish-centos8-source-quay
parent: kolla-build-centos8-source
post-run: tests/playbooks/publish.yml
vars:
publisher: true
kolla_registry: quay.io
kolla_namespace: openstack.kolla
secrets:
- kolla_quay_io_creds
- job:
name: kolla-publish-centos8s-source-quay
parent: kolla-build-centos8s-source
@ -204,11 +126,3 @@
kolla_namespace: openstack.kolla
secrets:
- kolla_quay_io_creds
- job:
name: kolla-build-no-infra-wheels-centos8-source
parent: kolla-build-no-infra-wheels-base
nodeset: kolla-centos8-stream
vars:
base_distro: centos
install_type: source

8
doc/source/admin/image-building.rst
View File

@ -78,14 +78,6 @@ See the :ref:`support matrix <support-matrix-base-images>` for information on
supported base image distribution versions and supported images on each
distribution.
The Victoria release supports both CentOS 8 Linux and CentOS 8 Stream base
container images. The default is to use CentOS 8 Linux. CentOS 8 Stream
may be used as follows:
.. code-block:: console
kolla-build --base centos --base-image quay.io/centos/centos --base-tag stream8
It is possible to build only a subset of images by specifying them on the
command line:

6
doc/source/support_matrix.rst
View File

@ -19,10 +19,14 @@ The following base container images are supported:
CentOS 7 is no longer supported as a base container image. The Train release
supports both CentOS 7 and 8 images, and provides a route for migration.
.. note::
CentOS 8 is no longer supported since it has been marked as End of Life
and repositories have been removed from CentOS mirrors.
=============== ============ =============================== ================
Distribution Default base Default base image Default base tag
=============== ============ =============================== ================
CentOS 8 Linux centos centos 8
CentOS 8 Stream centos quay.io/centos/centos stream8
Debian Buster debian debian 10
RHEL 8 rhel rhel 8

7
docker/base/Dockerfile.j2
View File

@ -223,6 +223,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
{# TODO(mnasiadka): Remove me once Nautilus C8S lands on mirror.centos.org #}
RUN sed -i \
-e "s|^\(mirrorlist.*\)|#\1|" \
-e "s|^#baseurl=http://mirror.centos.org.*|baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/nautilus/|" \
/etc/yum.repos.d/CentOS-Ceph-Nautilus.repo
{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} && dnf config-manager --disable {{ repo }} {% endfor -%}

4
docker/collectd/Dockerfile.j2
View File

@ -30,10 +30,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'collectd-dbi',
'collectd-disk',
'collectd-dns',
'collectd-dpdk_telemetry',
'collectd-generic-jmx',
'collectd-ipmi',
'collectd-libpod-stats',
'collectd-log_logstash',
'collectd-logparser',
'collectd-mcelog',
@ -47,7 +45,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'collectd-procevent',
'collectd-python',
'collectd-sensors',
'collectd-sensubility',
'collectd-smart',
'collectd-snmp',
'collectd-snmp-agent',
@ -57,7 +54,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'collectd-write_http',
'collectd-write_kafka',
'collectd-write_prometheus',
'python3-sqlalchemy-collectd'
] %}
{% if base_arch in ['x86_64', 'ppc64le'] %}

1
docker/openstack-base/Dockerfile.j2
View File

@ -87,7 +87,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-routes',
'python3-saharaclient',
'python3-sqlalchemy',
'python3-sqlalchemy-collectd',
'python3-sqlparse',
'python3-swiftclient',
'python3-sysv_ipc',

12
kolla/common/config.py
View File

@ -22,10 +22,10 @@ from kolla.version import version_info as version
BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian']
BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64']
DEFAULT_BASE_TAGS = {
'centos': '8',
'rhel': '8',
'debian': '10',
'ubuntu': '20.04',
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'},
'rhel': {'name': 'registry.access.redhat.com/ubi8', 'tag': 'latest'},
'debian': {'name': 'debian', 'tag': '10'},
'ubuntu': {'name': 'ubuntu', 'tag': '20.04'},
}
DISTRO_RELEASE = {
'centos': '8',
@ -1198,10 +1198,10 @@ 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))
conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag'])
prefix = '' if conf.openstack_release == 'master' else 'stable-'
openstack_branch = '{}{}'.format(prefix, conf.openstack_release)
conf.set_default('openstack_branch', openstack_branch)
if not conf.base_image:
conf.base_image = conf.base
conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name']

6
releasenotes/notes/centos-8-eol-4500333b5e01f448.yaml Normal file
View File

@ -0,0 +1,6 @@
---
critical:
- |
CentOS Linux 8 (non-Stream) support has been dropped, since
repositories have been removed from CentOS mirrors - see
`announcement <https://www.centos.org/centos-linux-eol/>`_.