Merge pull request ceph#62282 from adk3798/cephadm-ganesha-fix-server-scope

mgr/cephadm: fix Server_Scope in ganesha.conf

Reviewed-by: John Mulligan <[email protected]>

Author: adk3798

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 %}

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

@@ -3347,7 +3347,7 @@ def fake_keys():
             '        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'