mgr/cephadm: add nodeid and register_service for NFS Ganesha service visibility

- Add 'name' to template context in nfs.py
- Use consistent nodeid in RADOS_KV and CEPH blocks
- Enable register_service in CEPH block for service map visibility

Note: CEPH block is ignored in Ganesha 5.9 (seen as 'Unknown block (CEPH)' in logs),
so ceph -s visibility cannot be validated upstream. This change is forward-compatible
with newer Ganesha versions.

Fixes: https://tracker.ceph.com/issues/75709
Signed-off-by: Shubha Jain <SHUBHA.JAIN1@ibm.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 97b7e31d2b524dda5477ca0977fce22d8407fec2..f0f2e9cbca2b0914a242206cd822864977af88d9 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -46,6 +46,11 @@ RGW {
         name = "client.{{ rgw_user }}";
 }
 
+CEPH {
+        register_service = true;
+        nodeid = "{{ nodeid }}";
+}
+
 {% if tls_add %}
 TLS_CONFIG{
         Enable_TLS = {{ tls_add }};

diff --git a/src/pybind/mgr/cephadm/tests/services/test_ingress.py b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
index 2c2c25aa2cba141c7f99454b309fd56519f839a9..698c4677fe717786e986d68ecdef8716b2e42fbf 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/services/test_ingress.py
+++ b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
@@ -1081,6 +1081,11 @@ class TestIngressService:
             '        name = "client.nfs.foo.test.0.0-rgw";\n'
             '}\n'
             '\n'
+            'CEPH {\n'
+            '        register_service = true;\n'
+            '        nodeid = "0";\n'
+            '}\n'
+            '\n'
             "%url    rados://.nfs/foo/conf-nfs.foo"
         )
         nfs_expected_conf = {