From: John Mulligan Date: Tue, 12 Aug 2025 18:26:36 +0000 (-0400) Subject: tentacle: python-common/cephadm: use ceph20- prefixed images X-Git-Tag: v20.1.1~92^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=579d1d23d059b46566fcc0cb345599380f63b41d;p=ceph.git tentacle: python-common/cephadm: use ceph20- prefixed images The samba-containers project is now producing images that are based on samba + ceph tentacle packages (for libcephfs, etc). Use that as the image used for the samba server. Same for samba-metrics. Signed-off-by: John Mulligan --- diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py index 03443ba1be2f..a5a6c5f35ca8 100644 --- a/src/python-common/ceph/cephadm/images.py +++ b/src/python-common/ceph/cephadm/images.py @@ -39,8 +39,12 @@ class DefaultImages(Enum): 'jaeger_collector') JAEGER_AGENT = _create_image('quay.io/jaegertracing/jaeger-agent:1.29', 'jaeger_agent') JAEGER_QUERY = _create_image('quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query') - SAMBA = _create_image('quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba') - SAMBA_METRICS = _create_image('quay.io/samba.org/samba-metrics:latest', 'samba_metrics') + SAMBA = _create_image( + 'quay.io/samba.org/samba-server:ceph20-centos-amd64', 'samba' + ) + SAMBA_METRICS = _create_image( + 'quay.io/samba.org/samba-metrics:ceph20-centos-amd64', 'samba_metrics' + ) NGINX = _create_image('quay.io/ceph/nginx:sclorg-nginx-126', 'nginx') OAUTH2_PROXY = _create_image('quay.io/oauth2-proxy/oauth2-proxy:v7.6.0', 'oauth2_proxy')