diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-10 19:16:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-10 19:16:05 +0000 |
| commit | 73c456f85b4e861e4be12282a67ca59f5f319357 (patch) | |
| tree | 8f8adc4a9ad3077c2b4d8e3570b3e675fc9c652c /doc/source | |
| parent | 1cfd04ccc30d1b95cf07000d03edbbda1ed0ab16 (diff) | |
| parent | b69240ca4b7a1268854d6a39b279a3ebe183ca4e (diff) | |
| download | kolla-73c456f85b4e861e4be12282a67ca59f5f319357.tar.gz kolla-73c456f85b4e861e4be12282a67ca59f5f319357.zip | |
Merge "docs: update supported OS distros"
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/admin/image-building.rst | 5 | ||||
| -rw-r--r-- | doc/source/support_matrix.rst | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index 279f02b78..97f2ba8ac 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -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 diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index 85b8f9e33..1025cf6e2 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -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. |