From: Raimund Sacherer Date: Fri, 26 May 2023 15:52:57 +0000 (+0200) Subject: cephadm: Fix extra_container_args for iSCSI X-Git-Tag: v18.2.1~339^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eafb044e5aec108b571a3be2248adbf67b5592ed;p=ceph-ci.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 (cherry picked from commit ad60fc3db644b8bf44a582e79888e2fb15d7ce3a) --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 593a08f009e..5ebe7ccce96 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -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