mgr/cephadm: use same tag for all samba images

Ensure that all samba images use same tag, which implies that the use
the same common base image. Avoids cases of split functionality between
main samba-server image and smbmetrics.

Signed-off-by: Shachar Sharon <ssharon@redhat.com>

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index e82224157c3fd5ac6391d960b20476a6f90558b4..26e81dce6ac3174c82fb4b2bbc41a6874fb7189d 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -4167,6 +4167,9 @@ class TestCustomContainer:
                 )
 
 
+_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64'
+
+
 class TestSMB:
     @patch("cephadm.module.CephadmOrchestrator.get_unique_name")
     @patch("cephadm.serve.CephadmServe._run_cephadm")
@@ -4206,7 +4209,7 @@ class TestSMB:
                 'config': '',
                 'keyring': '[client.smb.config.tango.briskly]\nkey = None\n',
                 'config_auth_entity': 'client.smb.config.tango.briskly',
-                'metrics_image': 'quay.io/samba.org/samba-metrics:latest',
+                'metrics_image': _SAMBA_METRICS_IMAGE,
                 'service_ports': {'smb': 445, 'smbmetrics': 9922, 'ctdb': 4379},
             },
         }
@@ -4281,7 +4284,7 @@ class TestSMB:
                     '[client.smb.fs.fs2.share3]\nkey = None\n'
                 ),
                 'config_auth_entity': 'client.smb.config.tango.briskly',
-                'metrics_image': 'quay.io/samba.org/samba-metrics:latest',
+                'metrics_image': _SAMBA_METRICS_IMAGE,
                 'service_ports': {'smb': 445, 'smbmetrics': 9922, 'ctdb': 4379},
             },
         }

diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py
index 03443ba1be2f3382b1db5d01adf1235ed115f070..fbe1fe572eb56c8f3f925b1966ff799e68d1e20a 100644 (file)
--- a/src/python-common/ceph/cephadm/images.py
+++ b/src/python-common/ceph/cephadm/images.py
@@ -40,7 +40,8 @@ class DefaultImages(Enum):
     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_METRICS = _create_image('quay.io/samba.org/samba-metrics:devbuilds-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')