Skip to content

Commit

Permalink
mgr/cephadm: add the samba container image for smb daemons
Browse files Browse the repository at this point in the history
Signed-off-by: John Mulligan <jmulligan@redhat.com>
  • Loading branch information
phlogistonjohn committed Mar 21, 2024
1 parent c5e4912 commit 3985325
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/pybind/mgr/cephadm/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def os_exit_noop(status: int) -> None:
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'
# ------------------------------------------------------------------------------


Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -552,6 +558,7 @@ def __init__(self, *args: Any, **kwargs: Any):
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
Expand Down Expand Up @@ -1617,6 +1624,8 @@ def _get_container_image(self, daemon_name: str) -> Optional[str]:
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

Expand Down

0 comments on commit 3985325

Please sign in to comment.