]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Fix extra_container_args for iSCSI
authorRaimund Sacherer <rsachere@redhat.com>
Fri, 26 May 2023 15:52:57 +0000 (17:52 +0200)
committerAdam King <adking@redhat.com>
Wed, 11 Oct 2023 18:09:40 +0000 (14:09 -0400)
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

src/cephadm/cephadm

index 18b02d3bf2f999849eddc6601825d003c1788b5d..24f6a418ace885857063d832f227a1e78a3eb992 100755 (executable)
@@ -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.