Merge pull request ceph#58653 from phlogistonjohn/jjm-86-the-6

cephadm: do not hard code samba debuglevel 6

Reviewed-by: Adam King <[email protected]>
Reviewed-by: Anoop C S <[email protected]>

Author: adk3798

src/cephadm/cephadmlib/daemons/smb.py

@@ -279,7 +279,6 @@ def validate(self) -> None:
             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,

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]