From: John Mulligan Date: Mon, 30 Jun 2025 23:11:47 +0000 (-0400) Subject: mgr/cephadm: copy tls blobs from smb service spec to smb configuration X-Git-Tag: v20.1.1~25^2~28 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cb4964b1c87e7def62387dd6b77f970c79471d0c;p=ceph.git mgr/cephadm: copy tls blobs from smb service spec to smb configuration Signed-off-by: John Mulligan (cherry picked from commit 2327708b07a5d7875c5974ac979b1cb25148ab84) --- diff --git a/src/pybind/mgr/cephadm/services/smb.py b/src/pybind/mgr/cephadm/services/smb.py index a04b13ed611fc..83d388c34fe35 100644 --- a/src/pybind/mgr/cephadm/services/smb.py +++ b/src/pybind/mgr/cephadm/services/smb.py @@ -158,6 +158,23 @@ class SMBService(CephService): config_blobs['service_ports'] = smb_spec.service_ports() if smb_spec.bind_addrs: config_blobs['bind_networks'] = smb_spec.bind_networks() + if 'remote-control' in smb_spec.features: + files = config_blobs.setdefault('files', {}) + _add_cfg( + files, + 'remote_control.ssl.crt', + smb_spec.remote_control_ssl_cert, + ) + _add_cfg( + files, + 'remote_control.ssl.key', + smb_spec.remote_control_ssl_key, + ) + _add_cfg( + files, + 'remote_control.ca.crt', + smb_spec.remote_control_ca_cert, + ) logger.debug('smb generate_config: %r', config_blobs) self._configure_cluster_meta(smb_spec, daemon_spec)