From: Shubha Jain <SHUBHA.JAIN1@ibm.com>
Date: Thu, 21 May 2026 08:51:08 +0000 (+0530)
Subject: Revert "Merge pull request #67999 from Shubhaj1810/nfs-ganesha-servicemap-fix"
X-Git-Tag: v21.0.1~160^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f35766bc07bd5bdf51f07b56ea1ec4cd8d5eafd;p=ceph.git

Revert "Merge pull request #67999 from Shubhaj1810/nfs-ganesha-servicemap-fix"

This reverts commit d44d4fd402a0c23ab98056368d12cb83afd7bb32, reversing
changes made to 0e05a6054c822e36dcdf7b25d8d031fc937ac278.

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 a9758fff578..e9c6ad0d418 100644
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -72,11 +72,6 @@ RGW {
         name = "client.{{ rgw_user }}";
 }
 
-Ceph {
-        register_service = true;
-        nodeid = "{{ namespace }}.{{ 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 90092f46d38..47bb1473034 100644
--- a/src/pybind/mgr/cephadm/tests/services/test_ingress.py
+++ b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
@@ -1239,11 +1239,6 @@ class TestIngressService:
             '        name = "client.nfs.foo.test.0.0-rgw";\n'
             '}\n'
             '\n'
-            'Ceph {\n'
-            '        register_service = true;\n'
-            '        nodeid = "foo.0";\n'
-            '}\n'
-            '\n'
             "%url    rados://.nfs/foo/conf-nfs.foo"
         )
         nfs_expected_conf = {