From: John Mulligan <jmulligan@redhat.com>
Date: Sun, 5 Nov 2023 12:40:29 +0000 (-0500)
Subject: cephadm: add more ContainerDeamonForm methods to the iscsi class
X-Git-Tag: v19.0.0~79^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f07a3b678a5a16e97994d242616a5ae088a736b;p=ceph.git

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 <jmulligan@redhat.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 2b30e2563ed..6e34834535d 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