Skip to content

Commit f14c71e

Browse files
committed
mgr/cephadm: fix Server_Scope in ganesha.conf
Otherwise, with newer ganesha versions (hence why we didn't see this in testing) you get ganesha.nfsd-2[sigmgr] config_errs_to_log :CONFIG :WARN :Config File (/etc/ganesha/ganesha.conf:17): Syntax error in statement Signed-off-by: Adam King <[email protected]>
1 parent 88d2ce7 commit f14c71e

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
@@ -20,7 +20,7 @@ NFSv4 {
2020
Delegations = false;
2121
RecoveryBackend = "rados_cluster";
2222
Minor_Versions = 1, 2;
23-
Server_Scope = {{ cluster_id }}-{{ namespace }}
23+
Server_Scope = "{{ cluster_id }}-{{ namespace }}";
2424
{% if nfs_idmap_conf %}
2525
IdmapConf = "{{ nfs_idmap_conf }}";
2626
{% endif %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3347,7 +3347,7 @@ def fake_keys():
33473347
' Delegations = false;\n'
33483348
' RecoveryBackend = "rados_cluster";\n'
33493349
' Minor_Versions = 1, 2;\n'
3350-
f' Server_Scope = {cephadm_module._cluster_fsid}-foo\n'
3350+
f' Server_Scope = "{cephadm_module._cluster_fsid}-foo";\n'
33513351
' IdmapConf = "/etc/ganesha/idmap.conf";\n'
33523352
'}\n'
33533353
'\n'

0 commit comments

Comments
 (0)