diff options
| author | Redouane Kachach <rkachach@redhat.com> | 2022-11-23 10:11:12 +0100 |
|---|---|---|
| committer | Redouane Kachach <rkachach@redhat.com> | 2022-11-23 10:11:12 +0100 |
| commit | 8c2f12e1ba9e1638d29683c5642b06e624538ecb (patch) | |
| tree | 1c325112b1244b88f1cea9347dc8751957a4e9f8 /src | |
| parent | Merge pull request #48910 from joscollin/wip-fix-header-show-filters (diff) | |
| download | ceph-8c2f12e1ba9e1638d29683c5642b06e624538ecb.tar.xz ceph-8c2f12e1ba9e1638d29683c5642b06e624538ecb.zip | |
mgr/cephadm: fixing mgr port shown in ceph orch ps
Fixes: https://tracker.ceph.com/issues/58067
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/cephadm/cephadm.py | 5 | ||||
| -rw-r--r-- | src/pybind/mgr/cephadm/services/cephadmservice.py | 1 | ||||
| -rw-r--r-- | src/pybind/mgr/orchestrator/_interface.py | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 4201de3d9cb..83170718508 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -5182,8 +5182,11 @@ def create_mgr( mgr_c = get_container(ctx, fsid, 'mgr', mgr_id) # Note:the default port used by the Prometheus node exporter is opened in fw ctx.meta_json = json.dumps({'service_name': 'mgr'}) + ports = [9283, 8765] + if not ctx.skip_monitoring_stack: + ports.append(8443) deploy_daemon(ctx, fsid, 'mgr', mgr_id, mgr_c, uid, gid, - config=config, keyring=mgr_keyring, ports=[9283, 8765]) + config=config, keyring=mgr_keyring, ports=ports) # wait for the service to become available logger.info('Waiting for mgr to start...') diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index f4e9ffe703f..0d2231ca496 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -685,6 +685,7 @@ class MgrService(CephService): if ports: daemon_spec.ports = ports + daemon_spec.ports.append(self.mgr.service_discovery_port) daemon_spec.keyring = keyring daemon_spec.final_config, daemon_spec.deps = self.generate_config(daemon_spec) diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py index 3b92e50f927..9b204473692 100644 --- a/src/pybind/mgr/orchestrator/_interface.py +++ b/src/pybind/mgr/orchestrator/_interface.py @@ -1249,7 +1249,8 @@ class ServiceDescription(object): def get_port_summary(self) -> str: if not self.ports: return '' - return f"{(self.virtual_ip or '?').split('/')[0]}:{','.join(map(str, self.ports or []))}" + ports = sorted([int(x) for x in self.ports]) + return f"{(self.virtual_ip or '?').split('/')[0]}:{','.join(map(str, ports or []))}" def to_json(self) -> OrderedDict: out = self.spec.to_json() |