]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "qa/cephadm: add default container image name base" 67054/head
authorDavid Galloway <david.galloway@ibm.com>
Thu, 22 Jan 2026 20:53:33 +0000 (15:53 -0500)
committerDavid Galloway <david.galloway@ibm.com>
Thu, 22 Jan 2026 20:53:33 +0000 (15:53 -0500)
This reverts commit 1b155707a2b463240e5bf1c73f9ef0ade93cd7be.

This should have been a default in teuthology.yaml.  My reasoning for the revert is:
- This is hardcoding a value
- Folks wouldn't know this is configurable without looking at cephadm.py
- Instead of doing what the error message said to do, we removed the error message

Signed-off-by: David Galloway <david.galloway@ibm.com>
qa/tasks/cephadm.py

index abe2d9f5372db677f5b52eacab5944afeb4fad88..b3e9f61a6d8a18efaf9b0431f0eda4e422292073 100644 (file)
@@ -1961,7 +1961,11 @@ def task(ctx, config):
     ref = ctx.config.get("branch", "main")
     if not ctx.ceph[cluster_name].image:
         if not container_image_name:
-            container_image_name = 'quay.ceph.io/ceph-ci/ceph'
+            raise Exception("Configuration error occurred. "
+                            "The 'image' value is undefined for 'cephadm' task. "
+                            "Please provide corresponding options in the task's "
+                            "config, task 'overrides', or teuthology 'defaults' "
+                            "section.")
         sha1 = config.get('sha1')
         flavor = config.get('flavor', 'default')