smb: Update the configuration logic for smbd ports

This change lets us switch the default listening ports (445 and 139)
for smbd to a custom configured port or to 445 when host networking is
disabled. Previously, with host networking off, the legacy port 139 was
never published even though the daemon was listening on it inside the
container. For consistency, regardless of whether a custom SMB port is
set, the `smb ports` parameter in smb.conf is used. Since the SMB daemon
publishes whatever port is defined in the configuration, it makes sense
to remove the checks for clustered and custom ports while adding the
`smb ports` parameter.

Signed-off-by: Anoop C S <[email protected]>

Author: anoopcs9

src/cephadm/cephadmlib/daemons/smb.py

@@ -337,9 +337,8 @@ def container_args(self) -> List[str]:
             # networking) and need to publish ports via podman/docker.
             # All published ports happen at the primary container.
             if self.cfg.smb_port:
-                cargs.extend(
-                    self._publish(self.cfg.smb_port, Ports.SMB.value)
-                )
+                smb_port = self.cfg.smb_port
+                cargs.extend(self._publish(smb_port, smb_port))
             if self.cfg.metrics_port:
                 metrics_port = self.cfg.metrics_port
                 cargs.extend(self._publish(metrics_port, metrics_port))

src/pybind/mgr/smb/handler.py

@@ -793,10 +793,7 @@ def _generate_config(
         cluster_global_opts['workgroup'] = wg
         cluster_global_opts['idmap config * : backend'] = 'autorid'
         cluster_global_opts['idmap config * : range'] = '2000-9999999'
-    if cluster.is_clustered() and cluster.custom_ports:
-        # a ctdb enabled cluster (w/ host networking) with custom ports needs
-        # to change the port at the smbd level
-        cluster_global_opts['smb ports'] = str(_smb_port(cluster))
+    cluster_global_opts['smb ports'] = str(_smb_port(cluster))
 
     share_configs = {
         share.name: _generate_share(share, resolver, cephx_entity)