cephadm: add support for custom ceph conf/keyring files

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/cephadm/cephadmlib/daemons/smb.py b/src/cephadm/cephadmlib/daemons/smb.py
index b44445b7b58081fd78a30876fa3abd169c9be2f5..a7900a154f2cd333527c0d14eaa4676068e31427 100644 (file)
--- a/src/cephadm/cephadmlib/daemons/smb.py
+++ b/src/cephadm/cephadmlib/daemons/smb.py
@@ -882,6 +882,9 @@ class SMB(ContainerDaemonForm):
         if self._tls_files:
             tls_dir = str(data_dir / 'tls')
             mounts[tls_dir] = f'{_ETC_SAMBA_TLS}:z'
+        for filename in self._files or []:
+            if filename.endswith(('.ceph.conf', '.ceph.keyring')):
+                mounts[str(data_dir / filename)] = f'/etc/ceph/{filename}:z'
         if self._cfg.clustered:
             ctdb_persistent = str(data_dir / 'ctdb/persistent')
             ctdb_run = str(data_dir / 'ctdb/run')  # TODO: tmpfs too!