diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-26 10:40:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-26 10:40:49 +0000 |
| commit | 12e3483a96f8ff69a02e7c38c95be1655aa7db7e (patch) | |
| tree | 5ac657f10e5b5af804c0ad4bcc6aa4b27a7646d3 /doc/source/support_matrix.rst | |
| parent | 6656fd55859026e6ce11e30cb71571dae07e277f (diff) | |
| parent | d9efe9cac63e6916d1012e39ec0912e9693e7c52 (diff) | |
| download | kolla-12e3483a96f8ff69a02e7c38c95be1655aa7db7e.tar.gz kolla-12e3483a96f8ff69a02e7c38c95be1655aa7db7e.zip | |
Merge "Improve docs"
Diffstat (limited to 'doc/source/support_matrix.rst')
| -rw-r--r-- | doc/source/support_matrix.rst | 27 |
1 files changed, 8 insertions, 19 deletions
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 - |