From fd93ecd88a5f31172ec99921f72bee12bdd4a6b9 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Tue, 10 Sep 2024 09:47:44 +0200 Subject: [PATCH] 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 --- src/pybind/mgr/cephadm/tests/test_services.py | 4 ++-- src/python-common/ceph/deployment/service_spec.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 08802cd5923dc..2d4a9f5976f94 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -716,10 +716,10 @@ class TestMonitoring: "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, diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py index 0efd10545c6be..36f7366e670c6 100644 --- a/src/python-common/ceph/deployment/service_spec.py +++ b/src/python-common/ceph/deployment/service_spec.py @@ -2821,6 +2821,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() -- 2.39.5