From: John Mulligan <jmulligan@redhat.com>
Date: Fri, 15 Dec 2023 18:15:19 +0000 (-0500)
Subject: mgr/cephadm: add the samba container image for smb daemons
X-Git-Tag: v19.1.0~82^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb07baf82038351527e4c4fb21c180c00a894f1e;p=ceph.git

mgr/cephadm: add the samba container image for smb daemons

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 3985325e6983e3440ebb73a5b328071c096ac027)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index b8af6638a5cd..8cc9472b6319 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -130,6 +130,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'
 # ------------------------------------------------------------------------------
 
 
@@ -286,6 +287,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',
@@ -550,6 +556,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
@@ -1604,6 +1611,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