From: Adam King <47704447+adk3798@users.noreply.github.com> Date: Tue, 15 Jul 2025 13:53:16 +0000 (-0400) Subject: Merge pull request #62927 from ShwetaBhosale1/fix_issue_71031_add_Monitoring_Addr_par... X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a76fd61005f0a274f85af8dfc700a0b17cad7b16;p=ceph.git Merge pull request #62927 from ShwetaBhosale1/fix_issue_71031_add_Monitoring_Addr_param_to_ganesha.conf mgr/nfs: Add Monitoring_Addr parameter to ganesha.conf and provide option for user to provide ips for bind_addr Reviewed-by: Adam King Reviewed-by: Anthony D'Atri --- a76fd61005f0a274f85af8dfc700a0b17cad7b16 diff --cc src/pybind/mgr/cephadm/service_discovery.py index cddddcd3b088,855f53dd2883..ab92858df7cf --- a/src/pybind/mgr/cephadm/service_discovery.py +++ b/src/pybind/mgr/cephadm/service_discovery.py @@@ -21,9 -22,8 +21,10 @@@ import tempfil from cephadm.services.ingress import IngressSpec from cephadm.services.cephadmservice import CephExporterService from cephadm.services.nvmeof import NvmeofService + from cephadm.services.service_registry import service_registry +from ceph.deployment.service_spec import SMBSpec + if TYPE_CHECKING: from cephadm.module import CephadmOrchestrator diff --cc src/pybind/mgr/cephadm/tests/test_service_discovery.py index 48ce131b839a,dd29364794b3..c839c92238b0 --- a/src/pybind/mgr/cephadm/tests/test_service_discovery.py +++ b/src/pybind/mgr/cephadm/tests/test_service_discovery.py @@@ -52,14 -69,15 +69,19 @@@ class FakeServiceSpec def __init__(self, port): self.monitor_port = port + def metrics_exporter_port(self): + # TODO: for smb only + return 9922 + class FakeSpecDescription: - def __init__(self, port): - self.spec = FakeServiceSpec(port) + def __init__(self, service, port): + if service == 'ingress': + self.spec = FakeIngressServiceSpec(port) + elif service == 'nfs': + self.spec = FakeNFSServiceSpec(port) + else: + self.spec = FakeServiceSpec(port) class FakeSpecStore():