Skip to content

Commit fd93ecd

Browse files
committed
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 <[email protected]>
1 parent 9f29c0f commit fd93ecd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,10 +716,10 @@ def test_ceph_exporter_config_security_enabled(self, _get_fqdn, _run_cephadm, ce
716716
"name": "ceph-exporter.test",
717717
"image": "",
718718
"deploy_arguments": [],
719-
"params": {},
719+
"params": {"tcp_ports": [9926]},
720720
"meta": {
721721
"service_name": "ceph-exporter",
722-
"ports": [],
722+
"ports": [9926],
723723
"ip": None,
724724
"deployed_by": [],
725725
"rank": None,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2821,6 +2821,9 @@ def __init__(self,
28212821
self.prio_limit = prio_limit
28222822
self.stats_period = stats_period
28232823

2824+
def get_port_start(self) -> List[int]:
2825+
return [self.port or 9926]
2826+
28242827
def validate(self) -> None:
28252828
super(CephExporterSpec, self).validate()
28262829

0 commit comments

Comments
 (0)