Skip to content

Commit fcae104

Browse files
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 <[email protected]>
1 parent 655549e commit fcae104

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/cephadm/cephadmlib/daemons/smb.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ def validate(self) -> None:
279279
custom_dns=custom_dns,
280280
domain_member=Features.DOMAIN.value in instance_features,
281281
clustered=Features.CLUSTERED.value in instance_features,
282-
samba_debug_level=6,
283282
smb_port=self.smb_port,
284283
ceph_config_entity=ceph_config_entity,
285284
vhostname=vhostname,

src/cephadm/tests/test_deploy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ def test_deploy_smb_container(cephadm_fs, funkypatch):
558558
with open(basedir / 'unit.run') as f:
559559
runfile_lines = f.read().splitlines()
560560
assert 'podman' in runfile_lines[-1]
561-
assert runfile_lines[-1].endswith('quay.io/essembee/samba-server:latest --samba-debug-level=6 run smbd')
561+
assert runfile_lines[-1].endswith('quay.io/essembee/samba-server:latest run smbd')
562562
assert f'-v {basedir}/etc-samba-container:/etc/samba/container:z' in runfile_lines[-1]
563563
assert f'-v {basedir}/lib-samba:/var/lib/samba:z' in runfile_lines[-1]
564564
assert '-e SAMBA_CONTAINER_ID=smb1' in runfile_lines[-1]

0 commit comments

Comments
 (0)