cephadm/images: Update tags for samba and smbmetrics containers

It has been a few months since the samba-container and smbmetrics
projects started tagging image names with child manifests corresponding
to system architecture. This commit updates the default images for the
samba-server and samba-metrics containers to use those new architecture
independent tags.

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>

diff --git a/src/pybind/mgr/cephadm/tests/services/test_smb.py b/src/pybind/mgr/cephadm/tests/services/test_smb.py
index e55be55f543507bda6a8c41a8f7130d347a381dc..4acde77a0db224f955070a7ab3e435eb09877fc5 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/services/test_smb.py
+++ b/src/pybind/mgr/cephadm/tests/services/test_smb.py
@@ -6,7 +6,7 @@ from cephadm.module import CephadmOrchestrator
 from cephadm.tests.fixtures import with_host, with_service, async_side_effect
 
 
-_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64'
+_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:devbuilds-centos-any'
 
 
 class TestSMB:

diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py
index 747768d73e9ae10187d552e5025a4e26e05539e8..afe5c4a37b43242073f36cc91ba68574a9beaeb6 100644 (file)
--- a/src/python-common/ceph/cephadm/images.py
+++ b/src/python-common/ceph/cephadm/images.py
@@ -56,10 +56,10 @@ class DefaultImages(Enum):
         'quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query'
     )
     SAMBA = _create_image(
-        'quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba'
+        'quay.io/samba.org/samba-server:devbuilds-centos-any', 'samba'
     )
     SAMBA_METRICS = _create_image(
-        'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64',
+        'quay.io/samba.org/samba-metrics:devbuilds-centos-any',
         'samba_metrics',
     )
     NGINX = _create_image('quay.io/ceph/nginx:sclorg-nginx-126', 'nginx')