From accced728fedccc00601179f73a1a770689c05b0 Mon Sep 17 00:00:00 2001 From: Adam King Date: Wed, 12 Feb 2025 11:32:24 -0500 Subject: [PATCH] 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 (cherry picked from commit 4f5aa60c5d7605444b76485a473749d06ee65694) --- src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 | 2 +- src/pybind/mgr/cephadm/tests/test_services.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ded403169c976..ade6da5aea90a 100644 --- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 +++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 @@ -14,7 +14,7 @@ NFS_CORE_PARAM { NFSv4 { Delegations = false; - RecoveryBackend = 'rados_cluster'; + RecoveryBackend = "rados_cluster"; Minor_Versions = 1, 2; {% if nfs_idmap_conf %} IdmapConf = "{{ nfs_idmap_conf }}"; diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 9f3c3e1366ab1..5b897dc1f3fb7 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -2540,7 +2540,7 @@ class TestIngressService: '\n' 'NFSv4 {\n' ' Delegations = false;\n' - " RecoveryBackend = 'rados_cluster';\n" + ' RecoveryBackend = "rados_cluster";\n' ' Minor_Versions = 1, 2;\n' ' IdmapConf = "/etc/ganesha/idmap.conf";\n' '}\n' -- 2.47.3