From 9559f22dd654226fb73ebd9927fa5efb15d07d05 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chmacnaughton@gmail.com>
Date: Thu, 30 Jan 2020 17:27:09 +0100
Subject: [PATCH] Add note about Manila bits going stable

The charms included in this release to stable are:

- manila
- manila-ganesha
- ceph-fs

Change-Id: I510dcb37ead59f507d08764aa725308970d85d27
---
 doc/source/2002.rst | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/doc/source/2002.rst b/doc/source/2002.rst
index f073b5e7..45858504 100644
--- a/doc/source/2002.rst
+++ b/doc/source/2002.rst
@@ -23,6 +23,7 @@ Supported Charms
 * barbican-vault
 * ceilometer
 * ceilometer-agent
+* ceph-fs
 * ceph-mon
 * ceph-osd
 * ceph-proxy
@@ -40,6 +41,8 @@ Supported Charms
 * keystone
 * keystone-ldap
 * lxd
+* manila
+* manila-ganesha
 * neutron-api
 * neutron-openvswitch
 * neutron-gateway
@@ -61,10 +64,8 @@ Preview Charms
 ~~~~~~~~~~~~~~
 
 * barbican-softhsm
-* ceph-fs
 * cinder-backup
 * keystone-saml-mellon
-* manila
 * manila-generic
 * masakari
 * masakari-monitors
@@ -128,6 +129,20 @@ show up in the Launch Instance modal diaglog box.
 This option works from the Newton release, and has no effect on earlier
 OpenStack releases.
 
+New Charms
+==================
+
+CephFS, Manila, and Manila-Ganesha
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The 20.02 OpenStack Charms release includes a new charm to support Ganesha
+for use with Manila and CephFS. Manila and CephFS are also moving to supported
+status.
+
+.. note :: The manila-ganesha charm only supports OpenStack releases starting
+          at Rocky. Manila and CephFS are both supported back to Xenial
+          Mitaka.
+
 Preview Charm Features
 ======================