Skip to content

Commit 4f5aa60

Browse files
committed
mgr/cephadm: use double quotes for NFSv4 RecoveryBackend in ganesha conf
This came directly from someone on the ganesha team. We've actually had this use single quotes for a long time (at least since mid 2020) but I believe recent feature work on the ganesha side exposed the issue ganesha.nfsd-2[main] config_errs_to_log :CONFIG :WARN :Config File (/etc/ganesha/ganesha.conf:13): Unknown token ('rados_cluster') Fixes: https://tracker.ceph.com/issues/69930 Signed-off-by: Adam King <[email protected]>
1 parent 1b47950 commit 4f5aa60

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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
@@ -18,7 +18,7 @@ NFS_CORE_PARAM {
1818

1919
NFSv4 {
2020
Delegations = false;
21-
RecoveryBackend = 'rados_cluster';
21+
RecoveryBackend = "rados_cluster";
2222
Minor_Versions = 1, 2;
2323
Server_Scope = {{ cluster_id }}-{{ namespace }}
2424
{% if nfs_idmap_conf %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3251,7 +3251,7 @@ def fake_keys():
32513251
'\n'
32523252
'NFSv4 {\n'
32533253
' Delegations = false;\n'
3254-
" RecoveryBackend = 'rados_cluster';\n"
3254+
' RecoveryBackend = "rados_cluster";\n'
32553255
' Minor_Versions = 1, 2;\n'
32563256
f' Server_Scope = {cephadm_module._cluster_fsid}-foo\n'
32573257
' IdmapConf = "/etc/ganesha/idmap.conf";\n'

0 commit comments

Comments
 (0)