]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: avoid errors when calling sub-ident method
authorJohn Mulligan <jmulligan@redhat.com>
Fri, 17 Nov 2023 19:43:06 +0000 (14:43 -0500)
committerJohn Mulligan <jmulligan@redhat.com>
Tue, 2 Jan 2024 14:30:21 +0000 (09:30 -0500)
Signed-off-by: John Mulligan <jmulligan@redhat.com>
src/cephadm/cephadmlib/daemon_identity.py

index 4114cdf1b59745f682bacfa6bf5d6c8cd39ee1d7..cbefa15041a0c42b51c0dc29bbf4b71db071f6ff 100644 (file)
@@ -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: