From 6f35766bc07bd5bdf51f07b56ea1ec4cd8d5eafd Mon Sep 17 00:00:00 2001 From: Shubha Jain Date: Thu, 21 May 2026 14:21:08 +0530 Subject: [PATCH] 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 --- .../mgr/cephadm/templates/services/nfs/ganesha.conf.j2 | 5 ----- src/pybind/mgr/cephadm/tests/services/test_ingress.py | 5 ----- 2 files changed, 10 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 a9758fff578d..e9c6ad0d418e 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 90092f46d38d..47bb14730349 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 = { -- 2.47.3