]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: add support for user_sources smb spec field
authorJohn Mulligan <jmulligan@redhat.com>
Tue, 9 Apr 2024 21:44:30 +0000 (17:44 -0400)
committerJohn Mulligan <jmulligan@redhat.com>
Thu, 25 Apr 2024 23:10:38 +0000 (19:10 -0400)
Pass the user_sources spec field to the smb service being deployed.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
src/pybind/mgr/cephadm/services/smb.py

index 920c4ef02f74136f4cf7181abc0a52400e308a74..2ccd540d46a96a0caeba80fd9fa879f144e9fdaa 100644 (file)
@@ -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: