From 4f07a3b678a5a16e97994d242616a5ae088a736b Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Sun, 5 Nov 2023 07:40:29 -0500 Subject: [PATCH] cephadm: add more ContainerDeamonForm methods to the iscsi class Add method default_entrypoint to the iscsi daemon type class. Use that method in the get_container function. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 2b30e2563ed63..6e34834535df5 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -1275,6 +1275,9 @@ done def uid_gid(self, ctx: CephadmContext) -> Tuple[int, int]: return extract_uid_gid(ctx) + def default_entrypoint(self) -> str: + return self.entrypoint + ################################## @@ -2907,8 +2910,8 @@ def get_container( binds = get_container_binds(ctx, ident) mounts = get_container_mounts(ctx, ident) elif daemon_type == CephIscsi.daemon_type: - entrypoint = CephIscsi.entrypoint - name = ident.daemon_name + iscsi = CephIscsi.create(ctx, ident) + entrypoint = iscsi.default_entrypoint() # So the container can modprobe iscsi_target_mod and have write perms # to configfs we need to make this a privileged container. privileged = True -- 2.39.5