Merge pull request ceph#59694 from rkachach/fix_issue_67975

mgr/cephadm: open ceph-exporter when firewalld is enabled

Reviewed-by: Adam King <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/tests/test_services.py

@@ -716,10 +716,10 @@ def test_ceph_exporter_config_security_enabled(self, _get_fqdn, _run_cephadm, ce
                                                     "name": "ceph-exporter.test",
                                                     "image": "",
                                                     "deploy_arguments": [],
-                                                    "params": {},
+                                                    "params": {"tcp_ports": [9926]},
                                                     "meta": {
                                                         "service_name": "ceph-exporter",
-                                                        "ports": [],
+                                                        "ports": [9926],
                                                         "ip": None,
                                                         "deployed_by": [],
                                                         "rank": None,

src/python-common/ceph/deployment/service_spec.py

@@ -2839,6 +2839,9 @@ def __init__(self,
         self.prio_limit = prio_limit
         self.stats_period = stats_period
 
+    def get_port_start(self) -> List[int]:
+        return [self.port or 9926]
+
     def validate(self) -> None:
         super(CephExporterSpec, self).validate()