From 0d993640af3f3ff9572e62af9811d94a992df0dd Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 3 Sep 2020 12:30:33 -0400 Subject: [PATCH] cephadm: fix iSCSI unit.run file Current unit.run file generated for iSCSI when using podman tries to have two containers use the same conmon pidfile and cidfile for both containers which is invalid Fixes: https://tracker.ceph.com/issues/47291 Signed-off-by: Adam King --- src/cephadm/cephadm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 9d2f7020280..80fa58645ed 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -481,6 +481,9 @@ class CephIscsi(object): tcmu_container = get_container(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. + # extra args could cause issue with forking service type + tcmu_container.container_args = [] return tcmu_container ################################## @@ -1773,8 +1776,10 @@ def get_container_mounts(fsid, daemon_type, daemon_id, def get_container(fsid, daemon_type, daemon_id, privileged=False, ptrace=False, - container_args=[]): - # type: (str, str, Union[int, str], bool, bool, List[str]) -> CephContainer + container_args=None): + # type: (str, str, Union[int, str], bool, bool, Optional[List[str]]) -> CephContainer + if container_args is None: + container_args = [] if daemon_type in ['mon', 'osd']: # mon and osd need privileged in order for libudev to query devices privileged = True -- 2.47.3