From 85408ee75e8c7c11d7664c42da60ca7d7dd518cf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 10 Mar 2021 13:59:18 -0500 Subject: [PATCH] mgr/cephadm/schedule: only 1 port in DaemonPlacement It would be weird to dynamically number multiple ports (although doable). But until we have plans to support something like that, no need to handle it here. Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/schedule.py | 8 ++++---- src/pybind/mgr/cephadm/serve.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py index 905561585d2bb..b2dad5b0e7cee 100644 --- a/src/pybind/mgr/cephadm/schedule.py +++ b/src/pybind/mgr/cephadm/schedule.py @@ -16,7 +16,7 @@ class DaemonPlacement(NamedTuple): network: str = '' # for mons only name: str = '' ip: Optional[str] = None - ports: Optional[List[int]] = None + port: Optional[int] = None def __str__(self) -> str: res = self.hostname @@ -27,8 +27,8 @@ class DaemonPlacement(NamedTuple): other.append(f'name={self.name}') if self.ip: other.append(f'ip={self.ip}') - if self.ports: - other.append(f'ports={",".join(map(str, self.ports))}') + if self.port: + other.append(f'port={self.port}') if other: res += '(' + ' '.join(other) + ')' return res @@ -41,7 +41,7 @@ class DaemonPlacement(NamedTuple): return False if self.ip and self.ip != dd.ip: return False - if self.ports and self.ports != dd.ports: + if self.port and [self.port] != dd.ports: return False return True diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 5e40198192428..05761118f25f3 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -600,7 +600,7 @@ class CephadmServe: daemon_spec = svc.make_daemon_spec( slot.hostname, daemon_id, slot.network, spec, daemon_type=daemon_type, - ports=slot.ports + ports=[slot.port] if slot.port else None ) self.log.debug('Placing %s.%s on host %s' % ( daemon_type, daemon_id, slot.hostname)) -- 2.39.5