Skip to content

Commit b39be5a

Browse files
committed
mgr/nfs: add NFSv3 protocol to exports
To allow users to use NFSv3 by default with exports created through the nfs module Signed-off-by: Adam King <[email protected]>
1 parent 66bf56e commit b39be5a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

qa/tasks/cephfs/test_nfs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def setUp(self):
5555
"squash": "none",
5656
"security_label": True,
5757
"protocols": [
58-
4
58+
3, 4
5959
],
6060
"transports": [
6161
"TCP"

src/pybind/mgr/nfs/ganesha_conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ def from_dict(cls, export_id: int, ex_dict: Dict[str, Any]) -> 'Export':
459459
ex_dict.get('access_type', 'RO'),
460460
ex_dict.get('squash', 'no_root_squash'),
461461
ex_dict.get('security_label', True),
462-
ex_dict.get('protocols', [4]),
462+
ex_dict.get('protocols', [3, 4]),
463463
ex_dict.get('transports', ['TCP']),
464464
FSAL.from_dict(ex_dict.get('fsal', {})),
465465
[Client.from_dict(client) for client in ex_dict.get('clients', [])],

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ def _do_test_create_export_rgw_bucket(self):
10171017
assert export.pseudo == "/mybucket"
10181018
assert export.access_type == "none"
10191019
assert export.squash == "none"
1020-
assert export.protocols == [4]
1020+
assert export.protocols == [3, 4]
10211021
assert export.transports == ["TCP"]
10221022
assert export.fsal.name == "RGW"
10231023
assert export.fsal.user_id == "bucket_owner_user"
@@ -1060,7 +1060,7 @@ def _do_test_create_export_rgw_bucket_user(self):
10601060
assert export.pseudo == "/mybucket"
10611061
assert export.access_type == "none"
10621062
assert export.squash == "none"
1063-
assert export.protocols == [4]
1063+
assert export.protocols == [3, 4]
10641064
assert export.transports == ["TCP"]
10651065
assert export.fsal.name == "RGW"
10661066
assert export.fsal.access_key_id == "the_access_key"
@@ -1102,7 +1102,7 @@ def _do_test_create_export_rgw_user(self):
11021102
assert export.pseudo == "/mybucket"
11031103
assert export.access_type == "none"
11041104
assert export.squash == "none"
1105-
assert export.protocols == [4]
1105+
assert export.protocols == [3, 4]
11061106
assert export.transports == ["TCP"]
11071107
assert export.fsal.name == "RGW"
11081108
assert export.fsal.access_key_id == "the_access_key"
@@ -1151,7 +1151,7 @@ def _do_test_create_export_cephfs(self):
11511151
assert export.pseudo == "/cephfs2"
11521152
assert export.access_type == "none"
11531153
assert export.squash == "none"
1154-
assert export.protocols == [4]
1154+
assert export.protocols == [3, 4]
11551155
assert export.transports == ["TCP"]
11561156
assert export.fsal.name == "CEPH"
11571157
assert export.fsal.user_id == "nfs.foo.myfs.86ca58ef"

0 commit comments

Comments
 (0)