From d7407afd5527fb35660eddd59f568c1a58f02e10 Mon Sep 17 00:00:00 2001
From: Victoria Martinez de la Cruz <victoria@redhat.com>
Date: Wed, 13 Jan 2021 20:41:58 +0000
Subject: [PATCH] Update manila and Ceph matrix support doc

Include Wallaby (master) support matrix and
some extra considerations to consider on manila
with cephfs backends.

Change-Id: Iad7cb229151b8dd707a59553cb6e966090d0eeae
---
 doc/source/admin/cephfs_driver.rst | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/doc/source/admin/cephfs_driver.rst b/doc/source/admin/cephfs_driver.rst
index e08ac6eb75..86cf3416fd 100644
--- a/doc/source/admin/cephfs_driver.rst
+++ b/doc/source/admin/cephfs_driver.rst
@@ -69,9 +69,12 @@ Ceph testing matrix
 
 As Ceph and Manila continue to grow, it is essential to test and support
 combinations of releases supported by both projects. However, there is
-little community bandwidth to cover all of them. Below is the current state of
-testing for Ceph releases with this project. Adjacent components such as
-`devstack-plugin-ceph <https://opendev.org/openstack/devstack-plugin-ceph>`_
+little community bandwidth to cover all of them. For simplicity sake,
+we are focused on testing (and therefore supporting) the current Ceph
+active releases. Check out the list of Ceph active releases `here <https://docs.ceph.com/en/latest/releases/general/>`_.
+
+Below is the current state of testing for Ceph releases with this project.
+Adjacent components such as `devstack-plugin-ceph <https://opendev.org/openstack/devstack-plugin-ceph>`_
 and `tripleo <https://opendev.org/openstack/tripleo-heat-templates>`_ are
 added to the table below. Contributors to those projects can determine what
 versions of ceph are tested and supported with manila by those components;
@@ -97,9 +100,17 @@ however, their state is presented here for ease of access.
 +-------------------+----------+----------------------+-----------+
 | Ussuri            | Nautilus | Luminous, Nautilus   | Nautilus  |
 +-------------------+----------+----------------------+-----------+
-| Victoria          | Nautilus | Nautilus             | Nautilus  |
+| Victoria          | Nautilus | Nautilus, Octopus    | Nautilus  |
++-------------------+----------+----------------------+-----------+
+| Wallaby           | Octopus  | Nautilus, Octopus    | Nautilus  |
 +-------------------+----------+----------------------+-----------+
 
+Additionally, it is expected that the version of the Ceph client
+available to manila is aligned with the Ceph server version. Mixing
+server and client versions is strongly unadvised.
+
+In case of using the NFS Ganesha driver, it's also a good practice to use
+the versions that align with the Ceph version of choice.
 
 Common Prerequisites
 --------------------