From 314a391430ca133cac1ae57eaa522009e4e3a93e Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Thu, 20 Feb 2025 13:41:15 -0800
Subject: [PATCH] Don't override nfs protocols w/ CephFS

The CephFS NFS service may be configured to
allow any or all NFS versions; Manila exports
must not prevent that by only requesting
NFS v4.0+ via export policies.

Change-Id: If1cbeec2318f1b1bbd087cc2addf7f196fda8974
Closes-Bug: #2099273
---
 manila/share/drivers/cephfs/driver.py                     | 1 -
 manila/tests/share/drivers/cephfs/test_driver.py          | 1 -
 ...-overriding-cephfs-nfs-protocols-cf7e3949f688ad6f.yaml | 8 ++++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/bug-2099273-stop-overriding-cephfs-nfs-protocols-cf7e3949f688ad6f.yaml

diff --git a/manila/share/drivers/cephfs/driver.py b/manila/share/drivers/cephfs/driver.py
index 3f9cdc910c..ad272529f5 100644
--- a/manila/share/drivers/cephfs/driver.py
+++ b/manila/share/drivers/cephfs/driver.py
@@ -1612,7 +1612,6 @@ class NFSClusterProtocolHelper(NFSProtocolHelperMixin, ganesha.NASHelperBase):
             "pseudo": self._get_export_pseudo_path(share, sub_name=sub_name),
             "squash": "none",
             "security_label": True,
-            "protocols": [4],
             "fsal": {
                 "name": "CEPH",
                 "fs_name": self.volname,
diff --git a/manila/tests/share/drivers/cephfs/test_driver.py b/manila/tests/share/drivers/cephfs/test_driver.py
index 34d89d6465..caeb3b3c1c 100644
--- a/manila/tests/share/drivers/cephfs/test_driver.py
+++ b/manila/tests/share/drivers/cephfs/test_driver.py
@@ -1885,7 +1885,6 @@ class NFSClusterProtocolHelperTestCase(test.TestCase):
             "pseudo": "ganesha:/foo/bar",
             "squash": "none",
             "security_label": True,
-            "protocols": [4],
             "fsal": {
                 "name": "CEPH",
                 "fs_name": volname,
diff --git a/releasenotes/notes/bug-2099273-stop-overriding-cephfs-nfs-protocols-cf7e3949f688ad6f.yaml b/releasenotes/notes/bug-2099273-stop-overriding-cephfs-nfs-protocols-cf7e3949f688ad6f.yaml
new file mode 100644
index 0000000000..49e3a1ec3d
--- /dev/null
+++ b/releasenotes/notes/bug-2099273-stop-overriding-cephfs-nfs-protocols-cf7e3949f688ad6f.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    `Launchpad bug 2099273 <https://bugs.launchpad.net/manila/+bug/2099273>`
+    has been addressed by removing the NFS protocol override within the
+    request sent to the Ceph Manager API. This allows users to mount shares
+    exported by the Ceph NFS service with any NFS protocol version exposed by
+    that service.