From 8d0d0947796c94fee2955b87767763fd773e7545 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 23 Jun 2023 13:43:47 -0400 Subject: [PATCH] cephadm: add an identity field to BasicContainer Use the new DaemonIdentity class to help identify a container. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index d3b3ba50f1f6b..a4bbd932cc6c2 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -4472,8 +4472,8 @@ class BasicContainer: *, image: str, entrypoint: str, + identity: Optional['DaemonIdentity'], args: Optional[List[str]] = None, - container_name: str = '', container_args: Optional[List[str]] = None, envs: Optional[List[str]] = None, volume_mounts: Optional[Dict[str, str]] = None, @@ -4490,8 +4490,8 @@ class BasicContainer: self.ctx = ctx self.image = image self.entrypoint = entrypoint + self.identity = identity self.args = args or [] - self.container_name = container_name self.container_args = container_args or [] self.envs = envs or [] self.volume_mounts = volume_mounts or {} @@ -4519,7 +4519,8 @@ class BasicContainer: @property def cname(self) -> str: - return self.container_name + assert self.identity + return self.identity.container_name def build_run_cmd(self) -> List[str]: cmd_args: List[str] = [self._container_engine] -- 2.39.5