From: John Mulligan Date: Tue, 9 Apr 2024 21:44:30 +0000 (-0400) Subject: mgr/cephadm: add support for user_sources smb spec field X-Git-Tag: testing/wip-pdonnell-testing-20240503.010653-debug~22^2~34 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d933302bf8cb74d14b53efe0adbec29c3fd575f8;p=ceph-ci.git mgr/cephadm: add support for user_sources smb spec field Pass the user_sources spec field to the smb service being deployed. Signed-off-by: John Mulligan --- diff --git a/src/pybind/mgr/cephadm/services/smb.py b/src/pybind/mgr/cephadm/services/smb.py index 920c4ef02f7..2ccd540d46a 100644 --- a/src/pybind/mgr/cephadm/services/smb.py +++ b/src/pybind/mgr/cephadm/services/smb.py @@ -46,6 +46,8 @@ class SMBService(CephService): config_blobs['config_uri'] = smb_spec.config_uri if smb_spec.join_sources: config_blobs['join_sources'] = smb_spec.join_sources + if smb_spec.user_sources: + config_blobs['user_sources'] = smb_spec.user_sources if smb_spec.custom_dns: config_blobs['custom_dns'] = smb_spec.custom_dns ceph_users = smb_spec.include_ceph_users or [] @@ -86,6 +88,7 @@ class SMBService(CephService): def _pools_in_spec(self, smb_spec: SMBSpec) -> Iterator[str]: uris = [smb_spec.config_uri] uris.extend(smb_spec.join_sources or []) + uris.extend(smb_spec.user_sources or []) for uri in uris: pool = self._rados_uri_to_pool(uri) if pool: