From 866a468d37da9bb413ee957fe95677128a279db6 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 22 Jan 2026 15:53:33 -0500 Subject: [PATCH] Revert "qa/cephadm: add default container image name base" 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 --- qa/tasks/cephadm.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index abe2d9f5372d..b3e9f61a6d8a 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -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') -- 2.47.3