]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Fix extra_container_args for iSCSI 53010/head
authorRaimund Sacherer <rsachere@redhat.com>
Fri, 26 May 2023 15:52:57 +0000 (17:52 +0200)
committerAdam King <adking@redhat.com>
Tue, 15 Aug 2023 19:26:39 +0000 (15:26 -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)

src/cephadm/cephadm.py

index 593a08f009e9a5bd9a709505333598e4346f010b..5ebe7ccce96be5cc8294c3bcec14345a0d6e71dd 100755 (executable)
@@ -932,7 +932,7 @@ class CephIscsi(object):
         # daemon_id, is used to generated the cid and pid files used by podman but as both tcmu-runner
         # and rbd-target-api have the same daemon_id, it conflits and prevent the second container from
         # starting. .tcmu runner is appended to the daemon_id to fix that.
-        tcmu_container = get_container(self.ctx, self.fsid, self.daemon_type, str(self.daemon_id) + '.tcmu')
+        tcmu_container = get_deployment_container(self.ctx, self.fsid, self.daemon_type, str(self.daemon_id) + '.tcmu')
         tcmu_container.entrypoint = '/usr/bin/tcmu-runner'
         tcmu_container.cname = self.get_container_name(desc='tcmu')
         return tcmu_container