Merge branch prs/66171

diff --cc qa/tasks/cephadm.py
index 01a9ac11df6f360823abda68dd0bcb1fdbaba68f,3038e4db53c3a9de87152adb52464d76c73885aa..14dd10aaad2a472063dbb7dab7d5550e0a695589
--- 1/qa/tasks/cephadm.py
--- 2/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@@ -1961,9 -1957,14 +1961,10 @@@ def task(ctx, config)
      ref = ctx.config.get("branch", "main")
      if not ctx.ceph[cluster_name].image:
          if not container_image_name:
 -            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.")
 +            container_image_name = 'quay.ceph.io/ceph-ci/ceph'
          sha1 = config.get('sha1')
          flavor = config.get('flavor', 'default')
+         distro_suffix = config.get('distro-suffix', None)
  
          if any(_ in container_image_name for _ in (':', '@')):
              log.info('Provided image contains tag or digest, using it as is')