From 3f0fb630b3687868af8ddbb4cbed017f6316cdd9 Mon Sep 17 00:00:00 2001 From: Raimund Sacherer Date: Fri, 26 May 2023 17:52:57 +0200 Subject: [PATCH] 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) Conflicts: src/cephadm/cephadm --- src/cephadm/cephadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 788b849482721..85232507e6b91 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -927,8 +927,8 @@ class CephIscsi(object): # type: () -> CephContainer # 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 appened to the daemon_id to fix that. - tcmu_container = get_container(self.ctx, self.fsid, self.daemon_type, str(self.daemon_id) + '.tcmu') + # starting. .tcmu runner is appended to the daemon_id to fix that. + 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 -- 2.39.5