Merge pull request #62927 from ShwetaBhosale1/fix_issue_71031_add_Monitoring_Addr_par...

mgr/nfs: Add Monitoring_Addr parameter to ganesha.conf and provide option for user to provide ips for bind_addr

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

diff --cc src/pybind/mgr/cephadm/inventory.py
Simple merge

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/schedule.py
Simple merge

diff --cc src/pybind/mgr/cephadm/service_discovery.py
index cddddcd3b088d2630e7d2171410acbf2e9684975,855f53dd288336de3654740f2c56c726e28be198..ab92858df7cfc4ef24a728fe2474783265e5564f
--- 1/src/pybind/mgr/cephadm/service_discovery.py
--- 2/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 48ce131b839a5cd8aa7756f1c20769e2e7590ed9,dd29364794b362652735f8ae4dad66465f28749d..c839c92238b01e4be4585a5dd326b42f37b6a4dd
--- 1/src/pybind/mgr/cephadm/tests/test_service_discovery.py
--- 2/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():

diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge

diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge