Merge pull request ceph#55693 from adk3798/cephadm-nfsv3

mgr/nfs: add NFSv3 protocol to default protocols

Reviewed-by: John Mulligan <[email protected]>

Author: adk3798

qa/tasks/cephfs/test_nfs.py

@@ -55,7 +55,7 @@ def setUp(self):
          "squash": "none",
          "security_label": True,
          "protocols": [
-           4
+           3, 4
          ],
          "transports": [
            "TCP"

src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2

@@ -2,7 +2,9 @@
 NFS_CORE_PARAM {
         Enable_NLM = {{ enable_nlm }};
         Enable_RQUOTA = false;
-        Protocols = 4;
+        Protocols = 3, 4;
+        mount_path_pseudo = true;
+        Enable_UDP = false;
         NFS_Port = {{ port }};
         allow_set_io_flusher_fail = true;
 {% if bind_addr %}

src/pybind/mgr/cephadm/tests/test_services.py

@@ -3189,7 +3189,9 @@ def fake_keys():
             'NFS_CORE_PARAM {\n'
             '        Enable_NLM = true;\n'
             '        Enable_RQUOTA = false;\n'
-            '        Protocols = 4;\n'
+            '        Protocols = 3, 4;\n'
+            '        mount_path_pseudo = true;\n'
+            '        Enable_UDP = false;\n'
             '        NFS_Port = 2049;\n'
             '        allow_set_io_flusher_fail = true;\n'
             '        HAProxy_Hosts = 192.168.122.111, 10.10.2.20, 192.168.122.222;\n'

src/pybind/mgr/nfs/ganesha_conf.py

@@ -459,7 +459,7 @@ def from_dict(cls, export_id: int, ex_dict: Dict[str, Any]) -> 'Export':
                    ex_dict.get('access_type', 'RO'),
                    ex_dict.get('squash', 'no_root_squash'),
                    ex_dict.get('security_label', True),
-                   ex_dict.get('protocols', [4]),
+                   ex_dict.get('protocols', [3, 4]),
                    ex_dict.get('transports', ['TCP']),
                    FSAL.from_dict(ex_dict.get('fsal', {})),
                    [Client.from_dict(client) for client in ex_dict.get('clients', [])],

src/pybind/mgr/nfs/tests/test_nfs.py

@@ -1017,7 +1017,7 @@ def _do_test_create_export_rgw_bucket(self):
         assert export.pseudo == "/mybucket"
         assert export.access_type == "none"
         assert export.squash == "none"
-        assert export.protocols == [4]
+        assert export.protocols == [3, 4]
         assert export.transports == ["TCP"]
         assert export.fsal.name == "RGW"
         assert export.fsal.user_id == "bucket_owner_user"
@@ -1060,7 +1060,7 @@ def _do_test_create_export_rgw_bucket_user(self):
         assert export.pseudo == "/mybucket"
         assert export.access_type == "none"
         assert export.squash == "none"
-        assert export.protocols == [4]
+        assert export.protocols == [3, 4]
         assert export.transports == ["TCP"]
         assert export.fsal.name == "RGW"
         assert export.fsal.access_key_id == "the_access_key"
@@ -1102,7 +1102,7 @@ def _do_test_create_export_rgw_user(self):
         assert export.pseudo == "/mybucket"
         assert export.access_type == "none"
         assert export.squash == "none"
-        assert export.protocols == [4]
+        assert export.protocols == [3, 4]
         assert export.transports == ["TCP"]
         assert export.fsal.name == "RGW"
         assert export.fsal.access_key_id == "the_access_key"
@@ -1151,7 +1151,7 @@ def _do_test_create_export_cephfs(self):
         assert export.pseudo == "/cephfs2"
         assert export.access_type == "none"
         assert export.squash == "none"
-        assert export.protocols == [4]
+        assert export.protocols == [3, 4]
         assert export.transports == ["TCP"]
         assert export.fsal.name == "CEPH"
         assert export.fsal.user_id == "nfs.foo.myfs.86ca58ef"
@@ -1190,7 +1190,7 @@ def _do_test_create_export_cephfs_with_cmount_path(self):
         assert export.pseudo == "/cephfs3"
         assert export.access_type == "RW"
         assert export.squash == "root"
-        assert export.protocols == [4]
+        assert export.protocols == [3, 4]
         assert export.fsal.name == "CEPH"
         assert export.fsal.user_id == "nfs.foo.myfs.86ca58ef"
         assert export.fsal.cephx_key == "thekeyforclientabc"