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 <jmulligan@redhat.com>
(cherry picked from commit ca8f45e2ba68b41c01430ea62a695fe10116d469)

diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py
index 03443ba1be2f3382b1db5d01adf1235ed115f070..3c3c44cc4a71b5e60ef94b3ceb464ec3c9ed2d40 100644 (file)
--- a/src/python-common/ceph/cephadm/images.py
+++ b/src/python-common/ceph/cephadm/images.py
@@ -39,8 +39,8 @@ 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')