squid: cephadm: update latest stable release and default image

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 35f22cbdf672c29ead5b19c172d50f28daa6b523)

diff --git a/src/cephadm/cephadmlib/constants.py b/src/cephadm/cephadmlib/constants.py
index a6cf4389ff619942585cf662999042b8c45195c4..b833bd934d34d29d1ab3a68b840a1855d70042cd 100644 (file)
--- a/src/cephadm/cephadmlib/constants.py
+++ b/src/cephadm/cephadmlib/constants.py
@@ -1,7 +1,7 @@
 # constants.py - constant values used throughout the cephadm sources
 
 # Default container images -----------------------------------------------------
-DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
+DEFAULT_IMAGE = 'quay.io/ceph/ceph:v19'
 DEFAULT_IMAGE_IS_MAIN = True
 DEFAULT_IMAGE_RELEASE = 'squid'
 DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
@@ -22,7 +22,7 @@ DEFAULT_SMB_IMAGE = 'quay.io/samba.org/samba-server:devbuilds-centos-amd64'
 DEFAULT_REGISTRY = 'docker.io'  # normalize unqualified digests to this
 # ------------------------------------------------------------------------------
 
-LATEST_STABLE_RELEASE = 'reef'
+LATEST_STABLE_RELEASE = 'squid'
 DATA_DIR = '/var/lib/ceph'
 LOG_DIR = '/var/log/ceph'
 LOCK_DIR = '/run/cephadm'

diff --git a/src/cephadm/tests/test_util_funcs.py b/src/cephadm/tests/test_util_funcs.py
index aa64d54b073446ce184f5c129b6c5d3061fa318e..ded163ecdde3cadfda599ea2179cf5cf2cb076e9 100644 (file)
--- a/src/cephadm/tests/test_util_funcs.py
+++ b/src/cephadm/tests/test_util_funcs.py
@@ -785,7 +785,7 @@ class CompareContext2:
     def check(self, ctx):
         assert ctx.name == 'cc2'
         assert ctx.fsid == 'foobar'
-        assert ctx.image == 'quay.ceph.io/ceph-ci/ceph:main'
+        assert ctx.image == 'quay.io/ceph/ceph:v19'
         assert ctx.meta_properties == {"fruit": "banana", "vegetable": "carrot"}
         assert ctx.config_blobs == {
             "alpha": {"sloop": "John B"},