cephadm: set default image for tentacle release

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/src/cephadm/cephadmlib/constants.py b/src/cephadm/cephadmlib/constants.py
index ba8f56785821e3943e26fd525f1bd808377fb32b..b55ead842d871bf0d48fce2840b1c39b651012db 100644 (file)
--- a/src/cephadm/cephadmlib/constants.py
+++ b/src/cephadm/cephadmlib/constants.py
@@ -1,8 +1,8 @@
 # constants.py - constant values used throughout the cephadm sources
 
 # Default container images -----------------------------------------------------
-DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
-DEFAULT_IMAGE_IS_MAIN = True
+DEFAULT_IMAGE = 'quay.io/ceph/ceph:v20'
+DEFAULT_IMAGE_IS_MAIN = False
 DEFAULT_IMAGE_RELEASE = 'tentacle'
 DEFAULT_REGISTRY = 'quay.io'  # normalize unqualified digests to this
 # ------------------------------------------------------------------------------

diff --git a/src/cephadm/tests/test_util_funcs.py b/src/cephadm/tests/test_util_funcs.py
index d2aa39aca4bf8f3ce235f09ee5ed23603de55825..cb6ed2d15730e7556baafc442cb2b7438cca3f79 100644 (file)
--- a/src/cephadm/tests/test_util_funcs.py
+++ b/src/cephadm/tests/test_util_funcs.py
@@ -761,7 +761,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:v20'
         assert ctx.meta_properties == {"fruit": "banana", "vegetable": "carrot"}
         assert ctx.config_blobs == {
             "alpha": {"sloop": "John B"},

diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 751ff8c2558c50e4304b20be9c7e661da1790c8c..13104797d248a0fc1806635f02ee8ca0196210e3 100644 (file)
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -59,7 +59,7 @@ deps =
 commands =
     flake8 --config=tox.ini {posargs:cephadm.py cephadmlib}
     bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "docker.io" | wc -l) == 1'
-    bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "quay.io" | wc -l) == 7'
+    bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "quay.io" | wc -l) == 8'
 # Downstream distributions may choose to alter this "docker.io" number,
 # to make sure no new references to docker.io are creeping in unnoticed.