From d512ba409d6ec9c6f3218fe409b78fb86fc9d4ce Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 8 Jan 2020 10:00:47 +0100
Subject: [PATCH] Change Manila cephfs driver

Currently used cephfs driver have been deprecated in Pike [1], change to use
the proper one.

[1]: https://opendev.org/openstack/manila/src/branch/master/releasenotes/notes/rename-cephfs-native-driver-3d9b4e3c6c78ee98.yaml

Closes-Bug: #1858773
Change-Id: I33bea1d0049accd48c61f85c1165bee1e1cf0c87
---
 ansible/roles/manila/templates/manila-share.conf.j2         | 2 +-
 .../bug-1858773-manila-cephfs-driver-f6a75bd15c002363.yaml  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bug-1858773-manila-cephfs-driver-f6a75bd15c002363.yaml

diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2
index 0e66d9bdc7..db76ea42e8 100644
--- a/ansible/roles/manila/templates/manila-share.conf.j2
+++ b/ansible/roles/manila/templates/manila-share.conf.j2
@@ -94,7 +94,7 @@ hitachi_hnas_file_system_name = {{ hnas_file_system_name }}
 [cephfsnative1]
 driver_handles_share_servers = False
 share_backend_name = CEPHFS1
-share_driver = manila.share.drivers.cephfs.cephfs_native.CephFSNativeDriver
+share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
 cephfs_conf_path = /etc/ceph/ceph.conf
 cephfs_auth_id = manila
 cephfs_cluster_name = ceph
diff --git a/releasenotes/notes/bug-1858773-manila-cephfs-driver-f6a75bd15c002363.yaml b/releasenotes/notes/bug-1858773-manila-cephfs-driver-f6a75bd15c002363.yaml
new file mode 100644
index 0000000000..c6fa4e17ee
--- /dev/null
+++ b/releasenotes/notes/bug-1858773-manila-cephfs-driver-f6a75bd15c002363.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Change Manila cephfs share driver to
+    ``manila.share.drivers.cephfs.driver.CephFSDriver``, old driver was
+    deprecated.