From 185182b0a9861e6720b50835baf55250c8baf74f Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 17 Nov 2023 14:43:06 -0500 Subject: [PATCH] cephadm: avoid errors when calling sub-ident method Signed-off-by: John Mulligan --- src/cephadm/cephadmlib/daemon_identity.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadmlib/daemon_identity.py b/src/cephadm/cephadmlib/daemon_identity.py index 4114cdf1b5974..cbefa15041a0c 100644 --- a/src/cephadm/cephadmlib/daemon_identity.py +++ b/src/cephadm/cephadmlib/daemon_identity.py @@ -145,9 +145,10 @@ class DaemonSubIdentity(DaemonIdentity): @property def service_name(self) -> str: - return self._systemd_name( - suffix=self.subcomponent, extension='service' - ) + # use the parent's service_name to get the service. sub-identities + # must use other specific methods (like sidecar_service_name) for + # sub-identity based services + raise ValueError('called service_name on DaemonSubIdentity') @property def sidecar_service_name(self) -> str: -- 2.39.5