aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-06-03 08:29:52 +0000
committerGerrit Code Review <review@openstack.org>2020-06-03 08:29:52 +0000
commitfa5abde6c60c92b6996f051095a0a9cbd08d8227 (patch)
treeaa596317422facfc0fc90904d8467097f707bcc8
parent026689d762e93b9be0f1f21194006e15c51f1580 (diff)
parent68d25628745f89aecd0ac871d9dd16506634d854 (diff)
downloadkolla-fa5abde6c60c92b6996f051095a0a9cbd08d8227.tar.gz
kolla-fa5abde6c60c92b6996f051095a0a9cbd08d8227.zip
Merge "Add ceph releases per-distro to support matrix"
-rw-r--r--doc/source/ceph_versions.csv4
-rw-r--r--doc/source/support_matrix.rst7
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/source/ceph_versions.csv b/doc/source/ceph_versions.csv
new file mode 100644
index 000000000..39c152143
--- /dev/null
+++ b/doc/source/ceph_versions.csv
@@ -0,0 +1,4 @@
+Distro,Ceph source,Release
+CentOS,CentOS Storage SIG,Nautilus
+Ubuntu,Ubuntu Cloud Archive,Nautilus
+Debian,Debian,Nautilus
diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst
index 71ed26488..9d920ea96 100644
--- a/doc/source/support_matrix.rst
+++ b/doc/source/support_matrix.rst
@@ -90,3 +90,10 @@ 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
+