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 <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 b364b51dc6e84e3b901b064d2b4c59fd1bc36454..8c6a322506298086082fe1ff790a286440d6c9a2 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -18,7 +18,7 @@ NFS_CORE_PARAM {
 
 NFSv4 {
         Delegations = false;
-        RecoveryBackend = 'rados_cluster';
+        RecoveryBackend = "rados_cluster";
         Minor_Versions = 1, 2;
         Server_Scope = {{ cluster_id }}-{{ namespace }}
 {% if nfs_idmap_conf %}

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index ebdbcc4991d04e81269343c9851c779b8ec3910a..614c85e473a957734d7cae1078254d3056cbe6ab 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -3251,7 +3251,7 @@ class TestIngressService:
             '\n'
             'NFSv4 {\n'
             '        Delegations = false;\n'
-            "        RecoveryBackend = 'rados_cluster';\n"
+            '        RecoveryBackend = "rados_cluster";\n'
             '        Minor_Versions = 1, 2;\n'
             f'        Server_Scope = {cephadm_module._cluster_fsid}-foo\n'
             '        IdmapConf = "/etc/ganesha/idmap.conf";\n'