From 3985325e6983e3440ebb73a5b328071c096ac027 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 15 Dec 2023 13:15:19 -0500 Subject: [PATCH] mgr/cephadm: add the samba container image for smb daemons Signed-off-by: John Mulligan --- src/pybind/mgr/cephadm/module.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 8e813759172..8771c9a1e8c 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -132,6 +132,7 @@ DEFAULT_ELASTICSEARCH_IMAGE = 'quay.io/omrizeneva/elasticsearch:6.8.23' DEFAULT_JAEGER_COLLECTOR_IMAGE = 'quay.io/jaegertracing/jaeger-collector:1.29' DEFAULT_JAEGER_AGENT_IMAGE = 'quay.io/jaegertracing/jaeger-agent:1.29' DEFAULT_JAEGER_QUERY_IMAGE = 'quay.io/jaegertracing/jaeger-query:1.29' +DEFAULT_SAMBA_IMAGE = 'quay.io/samba.org/samba-server:devbuilds-centos-amd64' # ------------------------------------------------------------------------------ @@ -288,6 +289,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, default=DEFAULT_JAEGER_QUERY_IMAGE, desc='Jaeger query container image', ), + Option( + 'container_image_samba', + default=DEFAULT_SAMBA_IMAGE, + desc='Samba/SMB container image', + ), Option( 'warn_on_stray_hosts', type='bool', @@ -552,6 +558,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, self.container_image_jaeger_agent = '' self.container_image_jaeger_collector = '' self.container_image_jaeger_query = '' + self.container_image_samba = '' self.warn_on_stray_hosts = True self.warn_on_stray_daemons = True self.warn_on_failed_host_check = True @@ -1617,6 +1624,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, image = None elif daemon_type == 'snmp-gateway': image = self.container_image_snmp_gateway + elif daemon_type == SMBService.TYPE: + image = self.container_image_samba else: assert False, daemon_type -- 2.39.5