Skip to content

Commit 1e69ebc

Browse files
committed
mgr/cephadm: add NFSv3 protocol to cephadm generated ganesha conf
To allow users to use NFSv3 with cephadm deployed nfs daemons by default Signed-off-by: Adam King <[email protected]>
1 parent b39be5a commit 1e69ebc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
NFS_CORE_PARAM {
33
Enable_NLM = {{ enable_nlm }};
44
Enable_RQUOTA = false;
5-
Protocols = 4;
5+
Protocols = 3, 4;
66
NFS_Port = {{ port }};
77
allow_set_io_flusher_fail = true;
88
{% if bind_addr %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3187,7 +3187,7 @@ def fake_keys():
31873187
'NFS_CORE_PARAM {\n'
31883188
' Enable_NLM = true;\n'
31893189
' Enable_RQUOTA = false;\n'
3190-
' Protocols = 4;\n'
3190+
' Protocols = 3, 4;\n'
31913191
' NFS_Port = 2049;\n'
31923192
' allow_set_io_flusher_fail = true;\n'
31933193
' HAProxy_Hosts = 192.168.122.111, 10.10.2.20, 192.168.122.222;\n'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ def _do_test_create_export_cephfs_with_cmount_path(self):
11901190
assert export.pseudo == "/cephfs3"
11911191
assert export.access_type == "RW"
11921192
assert export.squash == "root"
1193-
assert export.protocols == [4]
1193+
assert export.protocols == [3, 4]
11941194
assert export.fsal.name == "CEPH"
11951195
assert export.fsal.user_id == "nfs.foo.myfs.86ca58ef"
11961196
assert export.fsal.cephx_key == "thekeyforclientabc"

0 commit comments

Comments
 (0)