From: John Mulligan <jmulligan@redhat.com>
Date: Fri, 17 Nov 2023 19:43:06 +0000 (-0500)
Subject: cephadm: avoid errors when calling sub-ident method
X-Git-Tag: v19.3.0~284^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=185182b0a9861e6720b50835baf55250c8baf74f;p=ceph.git

cephadm: avoid errors when calling sub-ident method

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/cephadm/cephadmlib/daemon_identity.py b/src/cephadm/cephadmlib/daemon_identity.py
index 4114cdf1b597..cbefa15041a0 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: