Merge pull request ceph#65931 from anoopcs9/update-smbd-ports-config

smb: Update the configuration logic for smbd ports

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

Author: adk3798

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)