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 <jmulligan@redhat.com>

diff --git a/src/cephadm/cephadmlib/daemons/smb.py b/src/cephadm/cephadmlib/daemons/smb.py
index e90329787c7e7afb89e10b3ce2a3d4b5e92cfd83..899ad24c65a351f6b9599afbfcdbeaae2e113362 100644 (file)
--- 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 0be62ad021eb22d57e7504fabd4a1972f55447fd..58f212beff6d6c0cc287edc709bd837b7abd172c 100644 (file)
--- 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]