From f295b1a0556d12d5fccb6329b4c42552e1cfa168 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 11 May 2021 10:34:41 +0100 Subject: [PATCH] docs: update supported OS distros * add CentOS Stream 8 info & reno * mark RHEL as deprecated in docs Change-Id: Ifa3b8c7365e4092202bf9e89b67293cf8d983e0a --- doc/source/user/operating-kolla.rst | 9 +++++++++ doc/source/user/quickstart.rst | 10 +++++----- doc/source/user/support-matrix.rst | 14 ++++++++++---- .../notes/centos-stream-686441cc4c0e47d7.yaml | 13 +++++++++++++ 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/centos-stream-686441cc4c0e47d7.yaml diff --git a/doc/source/user/operating-kolla.rst b/doc/source/user/operating-kolla.rst index ccbf92665f..067d9b534a 100644 --- a/doc/source/user/operating-kolla.rst +++ b/doc/source/user/operating-kolla.rst @@ -72,6 +72,15 @@ system. Ubuntu users upgrading from Ussuri should first upgrade OpenStack containers to Victoria, which uses the Ubuntu Focal 20.04 base container image. Hosts should then be upgraded to Ubuntu Focal 20.04. +CentOS Stream 8 +--------------- + +The Wallaby release adds support for CentOS Stream 8 as a host operating +system. CentOS Stream 8 support will also be added to a Victoria stable +release. CentOS Linux users upgrading from Victoria should first migrate hosts +and container images from CentOS Linux to CentOS Stream before upgrading to +Wallaby. + Preparation ----------- diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 3c21a1dd76..0a954bc418 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -364,12 +364,12 @@ There are a few options that are required to deploy Kolla Ansible: Kolla provides choice of several Linux distributions in containers: - - CentOS - - Ubuntu - - Debian - - RHEL + - CentOS Stream (``centos``) + - Ubuntu (``ubuntu``) + - Debian (``debian``) + - RHEL (``rhel``, deprecated) - For newcomers, we recommend to use CentOS 8 or Ubuntu 20.04. + For newcomers, we recommend to use CentOS Stream 8 or Ubuntu 20.04. .. code-block:: console diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 9552982edd..a57f95fa6b 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -15,9 +15,15 @@ Kolla Ansible supports the following host Operating Systems (OS): `_ for information on migrating to CentOS 8. -* CentOS 8 -* Debian Buster (10) -* RHEL 8 +.. note:: + + CentOS Linux 8 (as opposed to CentOS Stream 8) is no longer supported as a + host OS. The Victoria release will in future support both CentOS Linux 8 and + CentOS Stream 8, and provides a route for migration. + +* CentOS Stream 8 +* Debian Bullseye (11) +* RHEL 8 (deprecated) * Ubuntu Focal (20.04) Supported container images @@ -28,7 +34,7 @@ OS distribution. The following values are supported for ``kolla_base_distro``: * ``centos`` * ``debian`` -* ``rhel`` +* ``rhel`` (deprecated) * ``ubuntu`` For details of which images are supported on which distributions, see the diff --git a/releasenotes/notes/centos-stream-686441cc4c0e47d7.yaml b/releasenotes/notes/centos-stream-686441cc4c0e47d7.yaml new file mode 100644 index 0000000000..1eecab25e1 --- /dev/null +++ b/releasenotes/notes/centos-stream-686441cc4c0e47d7.yaml @@ -0,0 +1,13 @@ +--- +features: + - | + Adds support for CentOS Stream 8 as a host Operating System and base + container image. This is the only distribution of CentOS supported from + the Wallaby release. The Victoria release will support both CentOS Linux 8 + and CentOS Stream 8 hosts and images, and provides a route for migration. +upgrade: + - | + CentOS Linux 8 is no longer supported as a host Operating System or base + container image. CentOS users should migrate to CentOS Stream 8. The + Victoria release will support both CentOS Linux 8 and CentOS Stream 8 + hosts and images, and provides a route for migration.