diff options
| author | John Mulligan <jmulligan@redhat.com> | 2024-07-17 22:53:14 +0200 |
|---|---|---|
| committer | John Mulligan <jmulligan@redhat.com> | 2024-07-25 15:38:56 +0200 |
| commit | fcae1041c585398a6965586d2e0b580b818f3760 (patch) | |
| tree | 3c12a5edf4510cd27749dba1013166e2198a4be4 /src/cephadm | |
| parent | Merge pull request #58644 from rhcs-dashboard/fix-66994-main (diff) | |
| download | ceph-fcae1041c585398a6965586d2e0b580b818f3760.tar.xz ceph-fcae1041c585398a6965586d2e0b580b818f3760.zip | |
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>
Diffstat (limited to 'src/cephadm')
| -rw-r--r-- | src/cephadm/cephadmlib/daemons/smb.py | 1 | ||||
| -rw-r--r-- | src/cephadm/tests/test_deploy.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/cephadm/cephadmlib/daemons/smb.py b/src/cephadm/cephadmlib/daemons/smb.py index e90329787c7..899ad24c65a 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 0be62ad021e..58f212beff6 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] |