openstack
/
kolla
Code Issues Proposed changes

docs: update supported OS distros 

* correct base container image info
* show RHEL as deprecated

Change-Id: Ie8eec4cb4e29e7f659228e2792c13c01dfb4a41c
(cherry picked from commit b69240ca4b)
This commit is contained in:
Mark Goddard 2021-04-30 17:35:56 +01:00 committed by Radosław Piliszek
parent e7a71f17db
commit 7726bbe2d4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,8 @@ In general, images are built like this:
kolla-build
By default, the above command would build all images based on CentOS image.
By default, the above command would build all images based on a CentOS Stream
image.
The operator can change the base distro with the ``-b`` option:
@ -32,7 +33,7 @@ There are following distros (bases) available for building images:
- centos
- debian
- rhel
- rhel (deprecated)
- ubuntu
See the :ref:`support matrix <support-matrix-base-images>` for information on

16
doc/source/support_matrix.rst
View File

@ -14,14 +14,14 @@ Supported base images
The following base container images are supported:
============= ============ ================
Distribution Default base Default base tag
============= ============ ================
CentOS 8 centos 8
Debian Buster debian 10
RHEL 8 rhel 8
Ubuntu Focal ubuntu 20.04
============= ============ ================
================== =============================== ================
Distribution Default base Default base tag
================== =============================== ================
CentOS Stream 8 quay.io/centos/centos stream8
Debian Buster debian bullseye
RHEL8 (deprecated) registry.access.redhat.com/ubi8 latest
Ubuntu Focal ubuntu 20.04
================== =============================== ================
The remainder of this document outlines which images are supported on which of
these distribution.