From: Adam King <adking@redhat.com>
Date: Thu, 13 Mar 2025 15:54:45 +0000 (-0400)
Subject: mgr/cephadm: fix Server_Scope in ganesha.conf
X-Git-Tag: v20.3.0~277^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f14c71ed102a051be418aa5090838ee82678ade9;p=ceph.git

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 <adking@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
index bd859fd986e..8642c0ae162 100644
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -20,7 +20,7 @@ NFSv4 {
         Delegations = false;
         RecoveryBackend = "rados_cluster";
         Minor_Versions = 1, 2;
-        Server_Scope = {{ cluster_id }}-{{ namespace }}
+        Server_Scope = "{{ cluster_id }}-{{ namespace }}";
 {% if nfs_idmap_conf %}
         IdmapConf = "{{ nfs_idmap_conf }}";
 {% endif %}
diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index c8682c3b5d1..aa09c68110e 100644
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -3347,7 +3347,7 @@ class TestIngressService:
             '        Delegations = false;\n'
             '        RecoveryBackend = "rados_cluster";\n'
             '        Minor_Versions = 1, 2;\n'
-            f'        Server_Scope = {cephadm_module._cluster_fsid}-foo\n'
+            f'        Server_Scope = "{cephadm_module._cluster_fsid}-foo";\n'
             '        IdmapConf = "/etc/ganesha/idmap.conf";\n'
             '}\n'
             '\n'