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

ceph-exporter port was not opened properly during daemon deployment
forcing the user to open it manually. This change fixes the logic to
open the port automatically.

Fixes: https://tracker.ceph.com/issues/67975
Signed-off-by: Redouane Kachach <rkachach@ibm.com>
(cherry picked from commit fd93ecd88a5f31172ec99921f72bee12bdd4a6b9)

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

Conflict is because there was a new security related test that
was part of a feature in main but not squid that included the
ceph-exporter port

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index d99f656fbfe1722471662c44ebc45d90ba8a3929..a32d056a7050f17d9c3bc7320f354254fe566d50 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -2562,6 +2562,9 @@ class CephExporterSpec(ServiceSpec):
         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()