From: John Mulligan Date: Wed, 17 Jul 2024 20:53:14 +0000 (-0400) Subject: cephadm: do not hard code samba debuglevel 6 X-Git-Tag: v20.0.0~1409^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F58653%2Fhead;p=ceph.git cephadm: do not hard code samba debuglevel 6 Remove the line hard-coding the samba debuglevel to 6. It is a leftover from testing the early versions of the containers on ceph. Signed-off-by: John Mulligan --- diff --git a/src/cephadm/cephadmlib/daemons/smb.py b/src/cephadm/cephadmlib/daemons/smb.py index e90329787c7e..899ad24c65a3 100644 --- a/src/cephadm/cephadmlib/daemons/smb.py +++ b/src/cephadm/cephadmlib/daemons/smb.py @@ -279,7 +279,6 @@ class SMB(ContainerDaemonForm): custom_dns=custom_dns, domain_member=Features.DOMAIN.value in instance_features, clustered=Features.CLUSTERED.value in instance_features, - samba_debug_level=6, smb_port=self.smb_port, ceph_config_entity=ceph_config_entity, vhostname=vhostname, diff --git a/src/cephadm/tests/test_deploy.py b/src/cephadm/tests/test_deploy.py index 0be62ad021eb..58f212beff6d 100644 --- a/src/cephadm/tests/test_deploy.py +++ b/src/cephadm/tests/test_deploy.py @@ -558,7 +558,7 @@ def test_deploy_smb_container(cephadm_fs, funkypatch): with open(basedir / 'unit.run') as f: runfile_lines = f.read().splitlines() assert 'podman' in runfile_lines[-1] - assert runfile_lines[-1].endswith('quay.io/essembee/samba-server:latest --samba-debug-level=6 run smbd') + assert runfile_lines[-1].endswith('quay.io/essembee/samba-server:latest run smbd') assert f'-v {basedir}/etc-samba-container:/etc/samba/container:z' in runfile_lines[-1] assert f'-v {basedir}/lib-samba:/var/lib/samba:z' in runfile_lines[-1] assert '-e SAMBA_CONTAINER_ID=smb1' in runfile_lines[-1]