From d9efe9cac63e6916d1012e39ec0912e9693e7c52 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Thu, 17 Sep 2020 18:36:47 +0200 Subject: Improve docs Part of changes discussed during Kolla Kalls. These make our documentation easier to digest. Changes in conf.py are to avoid warnings from sphinx. Change-Id: I76ab6786b271963252278fcf12f1a28cab520fdb --- doc/source/support_matrix.rst | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'doc/source/support_matrix.rst') diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index 9c1d13af2..85b8f9e33 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -14,11 +14,6 @@ Supported base images The following base container images are supported: -.. note:: - - 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. - ============= ============ ================ Distribution Default base Default base tag ============= ============ ================ @@ -31,6 +26,14 @@ Ubuntu Focal ubuntu 20.04 The remainder of this document outlines which images are supported on which of these distribution. +Ceph versions in Kolla images +============================= + +.. csv-table:: Ceph versions + :header-rows: 2 + :stub-columns: 1 + :file: ./ceph_versions.csv + Support clause definitions ========================== @@ -42,13 +45,6 @@ Coverage: * CI in ``kolla-ansible`` is testing that images are functional * kolla core team is maintaining versions -M - Maintained --------------- - -Coverage: - -* kolla core team is maintaining versions - C - Community maintained ------------------------ @@ -90,10 +86,3 @@ Currently unbuildable images For a list of currently unbuildable images please look into ``kolla/image/build.py`` file - ``UNBUILDABLE_IMAGES`` dictionary. - -Ceph versions in Kolla images -============================= - -.. csv-table:: Ceph versions - :file: ./ceph_versions.csv - -- cgit v1.2.3