From: Raimund Sacherer <rsachere@redhat.com>
Date: Fri, 26 May 2023 15:52:57 +0000 (+0200)
Subject: cephadm: Fix extra_container_args for iSCSI
X-Git-Tag: v16.2.15~175^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9e8c82697ab512c421e3fae92e51d39db17654a;p=ceph.git

cephadm: Fix extra_container_args for iSCSI

extra_container_args where only applied for rbd_target_api container and not for
tcmu-runner container.

Signed-off-by: Raimund Sacherer <rsachere@redhat.com>
(cherry picked from commit ad60fc3db644b8bf44a582e79888e2fb15d7ce3a)

Conflicts:
	src/cephadm/cephadm
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 18b02d3bf2f9..24f6a418ace8 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -823,7 +823,7 @@ class CephIscsi(object):
 
     def get_tcmu_runner_container(self):
         # type: () -> CephContainer
-        tcmu_container = get_container(self.ctx, self.fsid, self.daemon_type, self.daemon_id)
+        tcmu_container = get_deployment_container(self.ctx, self.fsid, self.daemon_type, self.daemon_id)
         tcmu_container.entrypoint = '/usr/bin/tcmu-runner'
         tcmu_container.cname = self.get_container_name(desc='tcmu')
         # remove extra container args for tcmu container.